Fix coffee icon on merchant
Merge branch 'master' of github.com:blockchain/My-Wallet-iPhone