Some style improvements
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop

Conflicts:
	ecwsp/admissions/templates/admissions/student_application.html
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop