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

Conflicts:
	pom.xml
	src/main/java/net/java/javamoney/extras/FlavoredMonetaryAmount.java
	src/main/java/net/java/javamoney/extras/filter/MonetaryAmountFlavorPredicate.java
	src/test/java/net/java/javamoney/extras/BasisPointTest.java
Merge branch 'master' of
https://github.com/JavaMoney/javamoney-extras.git