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

This reverts commit 10b5ca8ba0cef9b7cd11d800bcd494232a55a20e.
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 move-js-to-coffee

Conflicts:
	app/assets/javascripts/application.js