Merge pull request #3 from taikoa/expiry_date

Adding expiry_date, fixing a typo with Amount
Translating expiration date
Merge remote-tracking branch 'upstream/master'
Changing default locale and date format to en