Merge branches 'Cesar' and 'master' of https://github.com/cesarcortes19/tesis-talleres into Cesar

Conflicts:
	src/main/webapp/WEB-INF/springConfig/spring-hibernate.xml