Use ckeditor_rails gem, not ckeditor
Merge branch 'master' into fix-ckeditor
Revert "Add static CKeditor assets"

This reverts commit 10b5ca8ba0cef9b7cd11d800bcd494232a55a20e.
Converted about to slim
Converted menu to slim
removed no longer necessary placeholder
Fixed annotations
removed no longer necessary placeholder
Merge pull request #28 from eMergence-by-Design/convert-about-to-slim

PENDING CI: Converted about to slim
Merge pull request #30 from eMergence-by-Design/annotate-models

Annotate models
Merge pull request #29 from eMergence-by-Design/convert-menu-to-slim

Convert menu to slim
Merge pull request #24 from eMergence-by-Design/fix-ckeditor

Fix ckeditor without including all its assets in our tree.
Merge branch 'master' into develop
Merge branch 'develop' into google-plus-signin

Conflicts:
	app/views/shared/_menu.html.erb