Merge branch 'master' into Tobias
tanke kring kortvisning i panel
Merge branch 'Tobias'

Conflicts:
	PlayLabel.java