#gt-125 work 2h
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/coupons_controller.rb
	app/controllers/psych_tests_controller.rb