goksiii commit without Johny's server class
Merge branch 'master' of https://github.com/gameDevPrep/DryRun.git

Conflicts:
	DryRun/src/dryrun/game/engine/LoadingScreen.java
	DryRun/src/dryrun/game/gui/misc/buttons/Button.java