Added weight to marking period
Merge branch 'master' of https://github.com/burke-software/django-sis

Conflicts:
	ecwsp/schedule/models.py