New data model version for Wave 6.
Add an Admiral entity.
Add wave 6 data and generated classes.
Update Android copy of data file as well.
Load Admirals and fix a set naming error.
Fix some dual faction that snuck in.
Adding Admirals to Captains

Added the new Admirals (Kirk and Dukat) to Captains list
resolved issues in data.xml preventing application from loading.
Began Admiral implementation
Merge pull request #72 from tblackwe/wave-6

Adding Admirals to Captains
Add additionalFaction to SetItem.
Six new ships in Wave 6 minus the Bajoran DS9.
Support dual-factions items in filtering and cost calculation.
Filter by faction for iOS.
New iOS test release.
I always forget to change this back.