Editor almost done. #3

Merged
debuggerx merged 17 commits from dev into master 4 years ago