merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/foxgenesis/slimesoccer/ui/MainMenu.java
	src/net/foxgenesis/slimesoccer/ui/SoccerGame.java
	src/net/foxgenesis/slimesoccer/ui/component/Button.java