Merge origin/master

Conflicts:
	development/JavaQuest/herman.properties
	development/JavaQuest/src/client/QuizView.form
	development/JavaQuest/src/client/QuizView.java
Merge origin/master

Conflicts:
	development/JavaQuest/herman.properties