worked on models.py - see comments in file
etc
Merge branch 'master' of https://github.com/lilsplat/bowser

Conflicts:
	courses/models.py