pom services
Merge branch 'master' of https://github.com/alejandronanez/discostore2

Conflicts:
	discostore-services/pom.xml