chucherias
Merge branch 'master' of https://github.com/jamper91/tiquetes

Conflicts:
	app/View/Users/registrar.ctp