Merge branch 'master' into develop

Conflicts:
	app/views/coupons/index.html.haml
	app/views/psych_tests/show_results.slim