admin route back
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/AuthController.php
	app/routes.php
	app/views/users/createstep1.blade.php