role options is NOT WORKING,
fixing in progress
Merge branch 'master' of https://github.com/emmasax1/UMM3601ursamajor
Role options reverted to old working commit, minor change added
Merge branch 'master' of https://github.com/emmasax1/UMM3601ursamajor
Group options in admin page added, not fully working
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/admin/admin.controller.js
	server/auth/google/passport.js
Adviser is not a role