Fixed links to multi-courses
Merge remote-tracking branch 'origin/develop'

Conflicts:
	course_catalog/models.py
Merge branch 'master' of https://github.com/ChrisCooper/QcumberD