billing subpolicy changes
Merge branch 'dhfl' of https://github.com/algosystech/collosys into dhfl

Conflicts:
	UserInterface/Billing/subpolicy/billing-subpolicy.html