Disable relative urls for tinymce
Merge branch 'develop'
Merge branch 'master' into custom
Try to fix tinymce problems
Fixes continued
Remove tinymce
Add ckeditor rails gem
Merge branch 'develop'
Merge branch 'master' into custom

Conflicts:
	app/views/layouts/_tinymce.html.erb
Clean assets
Precompile assets