Merge origin/master


	src/java/com/myapp/struts/ApplicationResource.properties
	src/java/upo/hibernate/almacen/Almacen.java
	web/WEB-INF/menu.jsp
	web/WEB-INF/struts-config.xml
	web/WEB-INF/usuario.jsp
Merge origin/master


	src/java/com/myapp/struts/ApplicationResource.properties
	src/java/upo/hibernate/almacen/Almacen.java
	web/WEB-INF/menu.jsp
	web/WEB-INF/struts-config.xml
	web/WEB-INF/usuario.jsp
Merge origin/master


	src/java/com/myapp/struts/ApplicationResource.properties
	src/java/upo/hibernate/almacen/Almacen.java
	web/WEB-INF/menu.jsp
	web/WEB-INF/struts-config.xml
	web/WEB-INF/usuario.jsp
Merge origin/master

Conflicts:
	src/java/upo/hibernate/almacen/Almacen.java
	src/java/upo/struts/reserva/AddReservaStrutsAction.java
	web/WEB-INF/reservausuario.jsp