Fixed things.
Updated gui.
Fixed things.
Merge remote-tracking branch 'origin/master' into GraphicInterfaceBeta

Conflicts:
	mrscenariofootball/src/mrscenariofootball/core/gui/ScenarioGUI.java
	mrserver/.classpath