adding propositions for aditional categories
Merge branch 'repart' - and some minor changes

Conflicts:
	client/views/courses/course.list.js
	server/testing.createnload.data.js
Merge branch 'master' of github.com:schuel/hmmm

Conflicts:
	client/views/courses/course.list.js
	server/testing.createnload.data.js