Validate Reserva
Merge origin/master

Conflicts:
	src/java/com/myapp/struts/ApplicationResource.properties