changes for new manager role
Merge branch 'develop' of https://github.com/winfel/wa_knowledge_structuring into develop

Conflicts:
	source/Server/UserManager.js