Fixed some scaling
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dk/unf/MauMau/game/Game.java
	src/dk/unf/MauMau/ui/GameRender.java
More merging