Added the ability to manage users in the admin page. cleaned up admin page, cleaned up a few other things
Merge branch 'master' of https://github.com/FruityRoad/web

Conflicts:
	Splash.php