Changed editor to kindeditor
Added image uploading
Merge branch 'feature-editor' into develop
Merge branch 'develop'