DEMO6-52 User2 change
DEMO52- Resolviendo conflicto

Merge branch 'nuestraRama' of https://github.com/javiergutites/DEMO6 into nuestraRama

Conflicts:
	pom.xml