CustViewModel Changes
CustViewModelChange
Merge branch 'saleosys' of https://github.com/algosystech/collosys into saleosys

Conflicts:
	UserInterface/Billing/formula/formula-condition.html
	UserInterface/Billing/subpolicy/billing-subpolicy.html
CustViewModelJS