some editor related issues fixed
Merge branch 'Dev' of https://github.com/mortie/jsSiteBuilder into Dev