Updated POM
Merge branch 'master' of
https://github.com/JavaMoney/javamoney-parent.git

Conflicts:
	pom.xml