ckeditor4
Merge branch 'master' of github.com:aossowski/activeadmin-selleo-cms into ckeditor4
Merge branch 'master' of github.com:aossowski/activeadmin-selleo-cms into ckeditor4

Conflicts:
	app/views/admin/pages/_translated_fields.html.haml
Merge branch 'master' of github.com:aossowski/activeadmin-selleo-cms into ckeditor4

Conflicts:
	app/views/admin/pages/_translated_fields.html.haml
ckeditor4 inline editing
ckeditor4 assets refactoring
ckeditor4 assets refactoring
bump version