Added conversion calculation to Curency.java
Merge origin/master