fixed billing related bugs found by asi per 1.0
#634 - all tests are green but need to write some more tests to be on the safe side
fixed #634
Merge remote-tracking branch 'origin/development' into development
fixed #634