view "admin" receive acitve users too
view "admin" receive acitve users to
Merge origin/joey_anton_testing into joey_anton_testing

Conflicts:
	app/controllers/AdminController.php
	app/models/User.php
-group leader list
-work progress
-nearly finished admin page
Merge origin/joey_anton_testing into joey_anton_testing

Conflicts:
	app/models/User.php
-added tooltips
working process
Merge origin/joey_anton_testing into joey_anton_testing
-added role management routes
bug fix
Merge origin/joey_anton_testing into joey_anton_testing
-give and delete roles
Merge branch 'joey_anton_testing' of https://github.com/ischweizer/phdpapertool into joey_anton_testing
-fixed typos
working process
-finished admin page
Merge branch 'joey_anton_testing' of https://github.com/ischweizer/phdpapertool into joey_anton_testing