cs proj comitted
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Shared/scripts/input-directives.js