Bringing the same changes in editor as done in Junioreditor
Merge branch 'master' of https://github.com/Jaaga/videovol
Changes in editor & editorcontroller
Changes in editor.php