stuff
stuff
stuff
stuff
Merge branch 'dev'

Conflicts:
	coursespace/settings.pyc
	coursespace/urls.pyc
	tasks/models.pyc