remerge
blub
Merge branch 'master' of https://github.com/qstall/qquiz

Conflicts:
	AppFrameworkQuiz/question.html
	AppFrameworkQuiz/src/QuestionView.js