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

Conflicts:
	composer.json
fix