cambios menores

cambios menores
Implementancion HOME
Merge branch 'desarrollo' into diseño

Conflicts:
	app/views/layouts/default.ctp