updated version pom, merge resulted in old version
Merge branch 'master' of https://github.com/AvegaGroup/spring-petclinic

Conflicts:
	pom.xml