minor stuff
Merge branch 'master' of https://github.com/qstall/qquiz

Conflicts:
	AppFrameworkQuiz/src/QuestionView.js
merge
Merge branch 'master' of https://github.com/qstall/qquiz