Merge
Merge branch 'feature/rich-text-editor' of github.com:eMergence-by-Design/social-emergence into feature/rich-text-editor

Conflicts:
	app/views/home/index.html.slim