#gt-170 fixed work 1h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/psych_test.scss
	app/mailers/coupon_mailer.rb
	app/views/psych_tests/career_anchors_test/_result.slim
	app/views/psych_tests/hollands_test/_result.slim
	app/views/psych_tests/tailors_test/_result.slim
	app/views/psych_tests/tailors_test/result.html.slim