ACADEMY: add filtering - student list
Merge remote-tracking branch 'origin/master'

Conflicts:
	academy/views.py
	dodream/settings.py
	templates/student-update.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	academy/forms.py
	academy/models.py
	academy/views.py
	dodream/settings.py
MERGE