Merge origin/master

Conflicts:
	development/JavaQuest/herman.properties