fixed broken editor and javascript errors
Merge pull request #3 from alexwenzel/master

fixed broken editor and javascript errors