Merge branch 'master' of github.com:tranfuga25s/turneraonline into permisos

Conflicts:
	app/View/Layouts/default.ctp
	app/View/Pages/home_venta.ctp
Arreglado error de cierre de funcion en vista y agregado el componente acl a la aplicacion
Merge branch 'master' of github.com:tranfuga25s/turneraonline into permisos

Conflicts:
	app/Controller/AppController.php
	app/View/Layouts/default.ctp
Merge