-working progress - enrollment finished, new group/lab creation
Merge branch 'joey_anton_testing' of https://github.com/ischweizer/phdpapertool into joey_anton_testing

Conflicts:
	app/controllers/EnrollInGroupController.php
	app/models/User.php
Merge branch 'joey_anton_testing' of https://github.com/ischweizer/phdpapertool into joey_anton_testing

Conflicts:
	app/controllers/EnrollInGroupController.php