Api changes
Merge branch 'master' of https://github.com/Spinoco/billing-api