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

This reverts commit 10b5ca8ba0cef9b7cd11d800bcd494232a55a20e.
Converted menu to slim
Merge pull request #29 from eMergence-by-Design/convert-menu-to-slim

Convert menu to slim
Made clearer that those factories don't do anything
Cleaned up js, and moved to coffee script
moved config to global scope
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
Merge pull request #34 from eMergence-by-Design/move-js-to-coffee

REVIEW: Move js to coffee
Merge pull request #32 from eMergence-by-Design/clean-factories

REVIEW: Made clearer that those factories don't do anything
Merge branch 'develop' into fix-style

Conflicts:
	Gemfile.lock