Merge pull request #2 from simutin/master

ew4t32
LALA
Merge branch 'master' of github.com:lmudvaynel/roll_up

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/index_script.js
	app/assets/stylesheets/pages.css.scss
deploy
Merge branch 'master' of github.com:lmudvaynel/roll_up
Db
DEPLOOOY
js css
Deploy fix
Seo active_admin
Russian localization
application.js tree
index script rename
Deploy fix
script
ckeditor model
uploader
ckeditor migration
migrate
Ckeditor fix