Falta solucionar el login desde las paginas internas
Merge remote-tracking branch 'andres/maqueteo' into maqueteo
feedback template
minors
login in every public pages
Merge remote-tracking branch 'hellman/master'
Merge branch 'master' into maqueteo

Conflicts:
	application/modules/public/php/views/scripts/index/home.phtml
	application/views/scripts/layout.phtml
minor
Merge remote-tracking branch 'helman/master'
Merge remote-tracking branch 'andres/master'
refactor testimonies to info-box