ajuste de login
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/Model/User.php