Merge branch 'master' of https://github.com/1u/hmmm

Conflicts:
	client/views/courses/course.list.js
comments_01
Merge branch 'master' of github.com:1u/hmmm

Conflicts:
	client/views/courses/course.list.js
comment01-collection added
comment01-collection added2
added missing file
added subscritions
Merge remote-tracking branch 'origin/master'

Conflicts:
	collections/courses.js~
ich liebe die welt _ partizipianz/partizipatoren/url/cssKosmetik/und vieles mehr
added course discussion feature
course disscussion feature added
subscriber-datenbank entfernt, direkt der course-datenbank angehaengt, verschiedene listen-aufrufe
popup for course-editing added
irgendöppis
Merge branch 'master' of https://github.com/1u/hmmm
rm
main menu und categories welche nicht funktionieren
making Order: splitted html to 7 files
keineahnungwassichgeänderthat
sdf
aufräumen