put part of the roles-code in own files
Merge commit 'a2800792fee55ec6147a417d911eac89b8c447ad' into fixMerge
Course DetailView: Discussion bugfixed
put part of the roles-code in own files

Conflicts:

	server/testing.createnload.data.js
Merge branch 'fixMerge'
Merge remote-tracking branch 'origin/master'