semi-working edit lock
Merge branch 'master' of https://github.com/iDevForFun/CrossPlatformEditor