Merge pull request #98 from mastercoin-MSC/master

Sync to master
add currency symbol to display when usercurrency is set
Merge pull request #1168 from achamely/master

Settings: Set currency symbol in wallet