split
Merge branch 'master' into divide

Conflicts:
	app/admin/recipients.rb
	app/controllers/recipients_controller.rb
	app/models/mailing.rb
	app/models/recipient.rb
	config/routes.rb
Merge branch 'master' into divide

Conflicts:
	app/admin/recipients.rb
	app/controllers/recipients_controller.rb
	app/models/mailing.rb
	app/models/recipient.rb
	config/routes.rb
stylus work
?
site root
site slider
pages
site fonts
localization and tests
routes minus module
Merge remote-tracking branch 'remotes/origin/divide'

Conflicts:
	app/admin/boykos_test.rb
	app/admin/career_anchors_test.rb
	app/admin/cattells_test.rb
	app/admin/documents.rb
	app/admin/hollands_test.rb
	app/admin/tailors_test.rb
	app/admin/yungs_test.rb
	app/controllers/pages_controller.rb
	app/models/ability.rb
	app/models/boykos_test.rb
	app/models/career_anchors_test.rb
	app/models/hollands_test.rb
	app/models/psych_test.rb
	app/models/recipient.rb
	app/models/tailors_test.rb
	app/views/tests/psych_tests/tailors_test/result.html.haml
	config/locales/ru.yml
	config/routes.rb
Merge remote-tracking branch 'origin/master'