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

Conflicts:
	app/views/admin/pages/_translated_fields.html.haml