#gt-177 Fixed, work 30m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/psych_tests/boykos_test/show.html.haml
	app/views/psych_tests/cattells_test/show.html.haml