Merged.
Merge remote-tracking branch 'origin/master'

Conflicts:
	money-ri/.project
	money-ri/src/main/java/javax/money/Money.java
	money-ri/src/main/java/javax/money/function/MinorUnits.java
	money-tck/pom.xml