Fix editor issue
Fix toolbar issue
Adde back images, renamed js lib
Merge remote-tracking branch 'upstream/master'
Merge pull request #118 from jerv13/master

Fix editor issue