Added Froala Editor #111
Merge branch 'develop'