RA-5, RA-6, RA-7

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