DFD-R4: 724 vs. 609, 322 vs. 596

[Blade]

Support 322, NonVehicle needs fixing (or preffereable splitting) to make several already existing features work correctly rather than just the one of upgrades. In addition, Upgrades still have 2 requests which are pretty much equivalent in terms of what will actually get implemented in the contest and the second one is already getting losts of love in another thread.

I also support 609 since its already possible to control the sort order to some extent based on tech levels, cost and such. The few things I'd like to control pale in comparison to 609.