Some minor tweaks to map rendering/screen
Merge remote-tracking branch 'origin/master'. Also updated tasks

Conflicts:
	TurnBased/src/inf1/oop/turnbased/screen/MapScreen.java