massor med småpyssel och buggfix
Merge branch 'master' into Emily

Conflicts:
	AboutUs.java
	PlayersPanel.java
Merge branch 'Emily'