refactor billing
refactor start and endtime
Merge remote-tracking branch 'origin/master'