Falta solucionar el login desde las paginas internas
Merge remote-tracking branch 'andres/maqueteo' into maqueteo
refactorizing
fixing layout
fixing
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
funcionando el login general y la recuperacion de contrasena con iterfaz
Merge remote-tracking branch 'helman/master'
Merge remote-tracking branch 'andres/master'
Merge remote-tracking branch 'fernando/master'
refactor testimonies to info-box
Commit del dia
human validation
Merge remote-tracking branch 'fernando/master'
CurrencyValue