Merge pull request #168 from tblackwe/master

Resolving issue 149
Added Improved Shields and Advanced Targeting Systems Resources (fixes #169)
Fixed bug where app crashed when trying to select resource when no sets with resources were selected (fixes #164)
Fixed bug where equipped upgrades were not validated properly (Fixes #170)
Fixed bug where Officers were not removed when changing off of officer resource
Merge branch 'master' of github.com:spacedockapp/spacedock
New iOS build
Fixed bug where Officers were getting Calvin Hudson's -1 SP on Independent ships
Calvin Hudson shouldn't be -1SP when on an Independent ship
Fixed more rows not showing cost
New iOS Build
Calvin Hudson shouldn't discount Admirals either.
New iOS build
Added new specials for ship class restrictions (OnlyShipClass_ & OnlyShipClass_CONTAINS_)
Added new special for Jean Luc Picard/Locutus (not_with_jean_luc_picard)
Fixed handling of Hugh & not_with_hugh
Fixed bug where Biogenic Charge could be equipped by Borg Scout Cube through a weapon slot
Modified movement grid to allow more speeds like Cube 112
Fix not_with_jean_luc_picard, Jean-Luc not Jean Luc
Added Oversized Cube
Added Vidiian Fina Prime
Removed random Tactical Drone from upgrades section
Fixed name of Enterprise NX-01 set
Merge pull request #2 from spacedockapp/master

Merging master down to fork