Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
Fetch service id from whmcs api for upgrades
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now
Custom fields were not saving
Custom fields were not saving
Start of form customization for billing
Removed hardcoded client ids.
Added a function that calculates vat and adds it to an invoice
Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now

Conflicts:
	airtime_mvc/application/controllers/BillingController.php
Design and overhaul of Account Plans screen

* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas

Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml