Completando login.
Merge branch 'master' of https://github.com/felipebonezi/livre.to

Conflicts:
	app/controllers/MaterialController.java