Show progress bar on the dashboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/courses_controller.rb