Implemented easier wysiwyg editor
Merge branch 'implement-old-functionallity', remote-tracking branch 'origin'