Merge branch `master` into `dashboards`.

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/courses_controller.rb
	app/views/users/_sidebar_grade_distribution.html.haml
	app/views/users/_sidebar_to_do_list.html.haml