exam answeres
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus
answeres
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus

Conflicts:
	administrator_index.html
admin merge