Editor rework started
Merge branch 'master' into peter
Almost compiled.  Need to recompile box2d