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