Merge origin/master

Conflicts:
	src/rfortune/GameMenuControl.java
	src/rfortune/GamePreferencesControl.java
Merge origin/master

Conflicts:
	src/rfortune/GameMenuControl.java
	src/rfortune/GamePreferencesControl.java
Merge origin/master