StudentMarkingPeriodGrade SQL calculation correction
Update models.py

Fixed bug where changing a grade with a marking period would not save if a override was present
Merge branch 'master' of https://github.com/burke-software/django-sis into angular_test