Remove tinymce attachment upload plugin
Merge remote-tracking branch 'origin/master' into ckeditor
initial ckeditor implementation added
Merge remote-tracking branch 'origin/master' into ckeditor
Merge branch 'master' into ckeditor

Conflicts:
	releaf-core/app/assets/javascripts/releaf/include/field.type_richtext.js
	releaf-core/app/views/releaf/base/_edit.field_type_richtext.html.haml
	releaf-core/app/views/releaf/base/_edit.field_type_richtext_i18n.html.haml
Attachment upload endpoint implemented for CKEditor file browser API
Merge branch 'master' into ckeditor

Conflicts:
	releaf-core/releaf-core.gemspec
CKEditor implementation finished