agregando thumbails para habitaciones
Creado modulo habitaciones all
Agregando stylesgeet a habitaciones
sombras
Agregando announce en habitaciones
announce styleshett habitaciones
Merge branch 'master' into habitaciones
Merge branch 'master' into habitaciones
agregando traducciones
Añadidos nuevos modulos al controlador staticpage
Merge remote-tracking branch 'origin' into luis
Merge branch 'habitaciones'

Conflicts:
	config/locales/es.yml
Merge branch 'luis'
agregando icons socials a navbar
Merge remote-tracking branch 'origin/luis'
Adaptando logo de tripadvisor
Agregado footer-reservation
Adaptando nuevo layout
agregado datepicker
Merge remote-tracking branch 'origin' into luis