CLSN-1266code review - till 17 Aug
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/AngularUI.csproj
	UserInterface/Index.html
	UserInterface/Scripts/_collosys/router.js