Added Billing classes (no PHPUnit yet)
Merge remote-tracking branch 'origin/alpha' into alpha