#gt-148 fixed work 10m
#gt-147 fixed work 30m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/psych_tests/index.html.slim