Merge
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
Adding Images to Playerclass
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Control/GlobalClassSelector.java
	src/View/ShoppingView.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Added shoppingview lobby and scoreboard
Merge branch 'master' of git@github.com:Maestro1337/ssha.git