Merge branch 'master' of git://github.com/inducer/relate

Conflicts:
	course/auth.py
	course/calendar.py
	course/enrollment.py
	course/flow.py
	course/grades.py
	course/im.py
	course/models.py
	course/page/base.py
	course/page/choice.py
	course/page/code.py
	course/page/text.py
	course/page/upload.py
	course/sandbox.py
	course/versioning.py
	course/views.py