atualizacion
Merge branch 'Pablo' of https://github.com/tupini07/HotelCaliforniaExpress into Pablo

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	web/Promocion.jsp