add redactor
Merge branch 'aminko.ru' of https://github.com/vened/commerce into aminko.ru

Conflicts:
	Gemfile.lock
	app/assets/javascripts/admin/admin.js
	app/assets/javascripts/admin/app.js