Merge origin/master

Conflicts:
	tienda_e.jimenezgr/src/java/springController/ControllerAdministracion.java