formula screen changes
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Billing/formula/formula.js