empezando parte users
index
Merge remote-tracking branch 'origin/master'

Conflicts:
	virtualtrade-server/virtualtrade-auth/src/main/webapp/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	virtualtrade-server/virtualtrade-auth/src/main/webapp/index.html