feature for coupons
smth
#gt-186 fixed work 1h
#gt-186 work 3h
#gt-186 fixed  work 8h
#gt-186 bugs fixed
Merge branch 'master' into develop

Conflicts:
	app/views/coupons/index.html.haml
	app/views/psych_tests/show_results.slim
Merge branch 'master' into develop

Conflicts:
	app/views/coupons/index.html.haml
	app/views/psych_tests/show_results.slim
Merge remote-tracking branch 'origin/master'