Joe fixed GadgetsController, added tiny stuff to ShipMarketController and CargoHold
Merge origin/master