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

Author: atsticks

.gitignore

@@ -19,5 +19,4 @@
 /money-api/platform/.settings
 /money-platform/api/.settings/*.prefs
 /money-platform/.settings
-/money-platform/target
-/money-ri
+/money-platform/target