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

Conflicts:
	pom.xml