prepare views for django > 1.5
Merge branch 'devel' of github.com:unicefuganda/rapidsms-edtrac into devel

Conflicts:
	education/templates/login.html