no message
Merge branch 'master' of https://github.com/elagunas/academia

Conflicts:
	academia/public/views/student/list.html