small changes in pom
Merge remote-tracking branch 'origin/master'

Conflicts:
	DnDTroops-service/pom.xml
	DnDTroopsProject/pom.xml
	DnDTroopsProject/src/main/resources/META-INF/applicationContext.xml