Hola
merge master in pablo
Merge remote-tracking branch 'origin/Andrea' into Pablo

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/java/clases/HDelux.java
	src/java/clases/HDoble.java
	src/java/clases/HStandard.java
	src/java/clases/Habitacion.java
	src/java/clases/Precio.java
	src/java/servlets/LoginUsuario.java
	src/java/servlets/ReservaClientes.java
	src/java/servlets/ServletHabitacion.java
	src/java/servlets/testMantenimiento.java
	web/index.jsp
	web/paginaDeHotel.jsp
	web/reservaH.jsp
	web/reservas(en proceso).jsp
terminar con el merge