Set Redactor
Add ImageUploader for Redactor
Merge branch 'develop' into feature/issue_1

Conflicts:
	app/assets/stylesheets/admin.css.scss
Merge branch 'feature/issue_1' into develop