Adding ckeditor
Beautifiying the ckeditor
Adding ckedit to article page
Updating text field before save
Merge branch 'CKEditor'

Conflicts:
	bundles/admin/public/js/app/article/templates/form.jade