Updating Mail stuff. Adding currency.
Merge branch 'master' of github.com:andrewmunro/Vanilla