Merge branch 'master' of https://github.com/mcuringa/college-consultant

Conflicts:
	consultant/consultant/models.py