preparing for a 1.7 push! (this may end up just being temporary...)
Adding the initial view for student application
adding jsonfield
adding the new template model for applications
tests to go along with the new template model (still incomplete)
Cleaned up code a little while on train
Merge branch 'master' of https://github.com/burke-software/django-sis into develop

Conflicts:
	ecwsp/grades/models.py
Merge branch 'master' of https://github.com/burke-software/django-sis into develop
Icon links in sidebar work, remove CoffeeScript error
Updated course api and course angular view
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop
Pagination works in angular
Started course section angular view
Angular detail page doesn't reload everything when params change
renaming a field and adding a default field
Merge commit '30e33f767a17e83751353d52f40fcd7d107611bd' into application-for-admission

Conflicts:
	django_sis/settings.py
	ecwsp/admissions/models.py
	requirements.txt
this seems to be necessary now... will have to take a look later
added jsonfield to requirements
Revert "this seems to be necessary now... will have to take a look later"

This reverts commit e1758a4237a100b7f4f3617bea39c90ae3da30ee.
whoops this model got lost in the merge... blare
added a hard-coded default template, will update this later