slug length validation didn't work
tinymce image upload gem added
ckeditor replaced tinymce
Merge branch 'ckeditor' into dev

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'dev'