Administración de Tickets!!
Merge branch 'master' of ssh://git@github.com/raalveco/aspos.git

Conflicts:
	app/controllers/login_controller.php