Fixing return values
Fixing stuff from merge
Merge branch 'feature-admin'

Conflicts:
	app/controllers/DerpAuthController.php
	app/routes.php