Merge branch 'feature/design_fix_40' into develop
locales and mail body fix
integretion bootstrap and simpleform
Merge branch 'feature/checkbox_bug_38' into develop
Merge branch 'develop' of github.com:kaize/nastachku into develop

Conflicts:
	config/initializers/simple_form.rb
Design bugs fixed.
Merge branch 'feature/design_bug_43' into staging

Conflicts:
	config/locales/ru.yml
Merge branch 'staging' of github.com:kaize/nastachku into staging

Conflicts:
	app/assets/stylesheets/mania-style/custom.css
	config/locales/flash.yml
	config/locales/ru.yml