Refactor User
Merge branch 'master' of github.com:EESoc/eesoc-website

Conflicts:
	app/controllers/Admin/UsersEActivitiesController.php
	app/controllers/Admin/UsersEEPeopleController.php