Fixed annoying bug in TradeWindow
Merge remote-tracking branch 'origin/master'

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