CLSN-591Code review
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Generic/menus/Menu.cs
	UserInterface/Index.html
	UserInterface/Shared/scripts/app.js
Merge branch 'master' of https://github.com/algosystech/collosys