courses aenderungen
Merge branch 'master' of github.com:auditoriumCS/auditorium

Conflicts:
	src/app/controllers/courses_controller.rb
	src/app/views/courses/_events_overview.html.erb~
	src/app/views/courses/_question_stream.html.erb~
	src/app/views/courses/show.html.erb
	src/app/views/courses/show.html.erb~
hendrik deleted all *~ files :)