Fix tests
Merge branch 'master' of github.com:codebrowser/web-client

Conflicts:
	test/selenium/students-view-test.js