Changed Sector Conditions to have their own type instead of being Mechanic
Merge pull request #109 from rrgeorge/master

Changed Sector Conditions to have their own type
Sector condition change

Merged into Android data file.
Fix tests on Android

Fixed cost calculation for flagships and fleet captains so that the resource cost is included even if the item isn't yet installed into the squad.

Fixed the load test for the new items. The specials test doesn't work yet as the officers are missing and the upgrades and the data items need to be sorted the same way for the matching to work. See the Objective-C implementation for an example.

Added officers to the list of items to be loaded so there would be less logging.
Merge pull request #9 from spacedockapp/master

Merging master down to fork