update
Merge branch 'master' of https://github.com/bitw/larauth

Conflicts:
	src/controllers/LarauthController.php