Merge branch 'master' of https://github.com/JavaMoney/javamoney-lib.git

Conflicts:
	bundles/pom.xml
Merge branch 'master' of https://github.com/JavaMoney/javamoney-lib.git