GUI STOOF a lot of band-aids
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseSimulator/GameArea.cs
	ZombieApocalypseWPF/MainWindow.xaml.cs