course discussion done
Merge branch 'master' of ssh://github.com/t6847kimo/nctuplus

Conflicts:
	app/controllers/courses_controller.rb
	app/models/course_teachership.rb
	db/schema.rb