Added CurrencyMap entity
Merge origin/master