modif version user2
DEMO5-56 kjhasjkas

Merge branch 'master' of https://github.com/javiergutites/DEMO5

Conflicts:
	pom.xml