adhoc payout new screen converting to directives changes
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Shared/scripts/controllers.js
	UserInterface/Shared/scripts/models.js