agregar funcion edit2 en user controller para editar la tabla data.
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/Controller/UsersController.php
buscador completo
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/Controller/UsersController.php
Merge branch 'master' of https://github.com/jamper91/tiquetes