Merge branch 'testing-branch' into new

Conflicts:
	app/views/groups/_professor_groups.html.erb