add javadoc
add javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/me/currencies/model/CurrencyManager.scala
add javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/me/currencies/model/CurrencyManager.scala