Consulta de UsuarioCOnsulta
Merge branch 'master' of https://github.com/UnalSoft/siac.git

Conflicts:
	src/controller/LoginController.java