Falta solucionar el login desde las paginas internas
Merge remote-tracking branch 'andres/maqueteo' into maqueteo
Merge branch 'master' into maqueteo

Conflicts:
	application/modules/public/php/views/scripts/index/home.phtml
	application/views/scripts/layout.phtml
minor