Conflicts:
	course/constants.py
	course/models.py
	course/page/text.py
	course/templates/course/analytics-flow.html
	course/versioning.py