user auth
user auth
Merge branch 'dev' of github.com:pier0n/hr into staging

Conflicts:
	app/controllers/AuthController.php
	app/views/admin/login.blade.php