ACADEMY: student edit function added
Merge remote-tracking branch 'origin/master'

Conflicts:
	academy/urls.py
	academy/views.py
	db.sqlite3
ACADEMY:  merge error fix