Mejoras Panel Superior
Merge branch 'master' of https://github.com/waltercrdz/tacs-tit4tat-GrupoXX

Conflicts:
	target/maven-archiver/pom.properties
	target/tit4tat-tacs-1.0-SNAPSHOT/WEB-INF/lib/tit4tat-tacs-1.0-SNAPSHOT.jar