#gt-158 fixed work 1h
#gt-160 fixed work 1h 30m
#gt-158 fixed work 15m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/psych_tests.slim