corregido subir imagenes
corregido problema imagenes
Merge origin/master

Conflicts:
	tienda_e.jimenezgr/src/java/springController/ControllerAdministracion.java
a
Revert "a"

This reverts commit 76840eb14322f743a8e224876ec4d58a16c7201b.
Merge origin/master

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