Added in Rich to the content fields
Merge branch 'refs/heads/enable_ckeditor' into rails_admin

Conflicts:
	Gemfile