Unified token class names in RI.
Merge branch 'master' of https://github.com/JavaMoney/javamoney.git