Bugfix JavaScript
Bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quiz/WebContent/eventListener.js