wip
wip student view
Merge branches 'Journal_student' and 'master' of https://github.com/henno/teodor into Journal_student
Merge branch 'master' into Journal_student
Journal teacher update
Refactor teacher journal
Add pills to groups page, hide journal table rows, update database
Merge remote-tracking branch 'origin/Journal_student'

Conflicts:
	doc/database.sql
Merge remote-tracking branch 'origin/master'