Cambio_nombre
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.0
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.0
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.0

Conflicts:
	app/View/Pages/inicio.ctp
Merge branch 'master' of https://github.com/jhonsegurag/scauq1.0