Queriendo hacer pull
Bajando cambios
Merge branch 'master' of https://github.com/quique0194/TiendaOnline

Conflicts:
	target/tomcat/work/localEngine/localhost/TiendaOnline/SESSIONS.ser
Merge branch 'master' of https://github.com/quique0194/TiendaOnline
Interfaz AdminContent & AdminCategory
Interfaces de Admin