updated merchant app
Merge pull request #36 from agiliq/fix_bitcoin_error

updated merchant app