ng-fx script included
removing category parameter from billing
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Allocation/subpolicy/allocsubpolicy.html
Merge branch 'master' of https://github.com/algosystech/collosys
moving to bootstrap3
Merge branch 'master' of https://github.com/algosystech/collosys
moving to bootstrap3