-preMerge
Merge remote-tracking branch 'origin/master'

Conflicts:
	DryRun/src/dryrun/game/common/Player.java
	DryRun/src/dryrun/game/gui/menus/Menu.java
	DryRun/src/dryrun/game/gui/misc/buttons/Button.java
	DryRun/src/dryrun/game/mechanics/Game.java