Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/burke-software/django-sis into course_sections
next school year django 1.6/1.7 compat