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

Conflicts:
	_includes/_administrator/_exam-test-list.html
Merge branch 'master' of https://github.com/kokakoola/eksamikeskus.git