Unfucked fucked up fuckeries.

Fixed conflict issues.  Hopefully...
Merge branch 'master' of https://github.com/lansdon/cpts_323

Conflicts:
	Production/Src/SadGUI/TargetsViewModel.cs