Merge origin/master

Conflicts:
	highscore/highscore.txt
	questions/adult/adult_Question1.txt
	questions/adult/adult_Question10.txt
	questions/adult/adult_Question13.txt
	questions/adult/adult_Question17.txt