bugfix
Merge branch 'master' of https://github.com/courseportal/coursePortal

Conflicts:
	web/models.py