start on merchant service
Merge branch 'master' of https://github.com/headphonesjones/Blohaute
refactor service to use merchant client
manually insert AJs changes to avoid merge issues
Merge branch 'master' of https://github.com/headphonesjones/Blohaute