.
Merge branch 'master' of https://github.com/flaket/ostbar

Conflicts:
	server/models/entities/quizquestion.js