Merge origin/master

Conflicts:
	nbproject/project.properties
	src/java/upo/hibernate/almacen/Almacen.java
	web/WEB-INF/struts-config.xml
	web/WEB-INF/usuario.jsp