Disabled the dock button if there are no shields or weapons for sale
Merge remote-tracking branch 'origin/master' into james/dev
Fixed type (Gadjet -> Gadget)
Fixes to Encounter class (typos, removing excess code, etc.)
Fixed Reader test to conform with new ship/government format. Tech levels do not test for government frequencies.
Merge branch 'master' into jack/dev
Merge remote-tracking branch 'origin/master' into james/dev