Merge branch 'master' of https://github.com/UCDAAPIT/coursespace

Conflicts:
	coursespace/settings.py
	coursespace/settings.pyc
stuff