1
Merge branch 'origin/master'

Conflicts:
	app/courses/courses.iws