Snapshot has a course and an exercise
Merge branch 'master' into diff

Conflicts:
	static/assets/js/codebrowser-min.js