merge commit
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Shared/templates/output-directive.html