Merge pull request #117 from jerv13/master

Update js for admin
Fix editor issue