Merge pull request #85 from tblackwe/master

Replacing Captain/Upgrade with same name different version
One last Android test release before Wave 6 escapes to production.
New Android release.
Squashed commit of the following:

commit 2f5712baa4766fd16040741167e7459365366a50
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sun Jul 20 21:05:16 2014 -0700

    Prepare for the first beta release of 1.1 for Mac.

commit 80c529091976377016730a77593102629b9d9f3c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sun Jul 20 21:04:58 2014 -0700

    Move most responsibility for array controllers and tables into the tab controllers.

commit 335c859144d713a6317a8e04e28d30c32f269b1c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sat Jul 19 19:40:32 2014 -0700

    New Android release.

commit 261134df305fac772d51c3dc811e93964a460932
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sat Jul 19 09:07:24 2014 -0700

    Move responsibility for filtering into tab controllers.

commit 76fcd0b84237a8e151ac0cea1f6764c4ac37d02c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sat Jul 19 07:36:37 2014 -0700

    Add set tab controller.

commit 433f2197335261f0d1558cd20a4b56395a9ba265
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 20:06:46 2014 -0700

    One last Android test release before Wave 6 escapes to production.

commit b679e844d47331f18d76db4aacb99de317d5a46a
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Fri Jul 18 21:42:28 2014 -0400

    enabling replacing upgrade with same name different version

commit a8260d481be05d5748541acff95d61b22c8905c2
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Fri Jul 18 21:16:07 2014 -0400

    Enabling replacing captain with same name different version captain.

commit 3dbb2b7cf29068c7f9c9a519274e026c068fa417
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 09:45:00 2014 -0700

    Move currently selected item responsibility to tab controller.

commit 58050d15c316bf7cd3f02aac237c4ca98adc042e
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:44:12 2014 -0700

    Another new Android test release.

commit 7b0f660468020e8feecd5a06e47132940fcf63cf
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:42:14 2014 -0700

    Don't need to add Admirals to captain's list.

commit 7882928eb21cb45e53458a3e96ed046530d5ae1f
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:38:45 2014 -0700

    Update data file for Android.

commit d270db7e234fef7ddcb393c8573a4b36fb859f7c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:31:33 2014 -0700

    New Android test release.

commit 8750f71075189b16f3f1a2ce495604541dbacba9
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:29:19 2014 -0700

    Sakonna needs to operate on calculated cost.

commit a69841ace957e199823d3e2fca9fbe08b4892b2c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:28:59 2014 -0700

    Fix loading of admirals.

commit 2041a0b80f635c0c014c16dcf836eac509206d9c
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 08:17:38 2014 -0700

    Add some more test cases to the specials test file.

commit 822fa8c5f610178ad48f0d782af60ce8c9afabba
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 07:49:48 2014 -0700

    Make tests work again and fix ordering of call to retrieve upgrades to fix Lauran.

commit a8b475a2ec9032846075e5c3ffd82369bf041392
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 07:28:55 2014 -0700

    Khan doesn't give discounts to Admirals.

commit 98affc901975e3d8e9da043d8cca9f11edf51b37
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 07:28:31 2014 -0700

    Add installed cost and installed title style to other tabs.

commit 7fbb38f8f3d2140b46f1d1ae77b200023e19ca6f
Author: Rob Tsuk <rob@tsuk.com>
Date:   Fri Jul 18 07:28:11 2014 -0700

    Khan doesn't give discounts to Admirals.

commit 88f21e5c30c953aa8f6e13cb60d186c85257b8f3
Author: Rob Tsuk <rob@tsuk.com>
Date:   Thu Jul 17 07:43:19 2014 -0700

    Handle default sort descriptors in tab controller.

commit 16b1b5e63b48c8c1b2d5bd85581e9cd964eed063
Author: Rob Tsuk <rob@tsuk.com>
Date:   Wed Jul 16 22:54:23 2014 -0700

    More tab controllers.

commit 51a983b7503aabc323e83d3a4caeb23473b8f4a9
Author: Rob Tsuk <rob@tsuk.com>
Date:   Wed Jul 16 21:51:32 2014 -0700

    Fix searches so that Admirals don't show up twice in the Captain's list.

commit 7c1da0846cc5b939f5ac5f406fd95a800931a28d
Author: Rob Tsuk <rob@tsuk.com>
Date:   Wed Jul 16 21:49:21 2014 -0700

    Add the Admirals as Captains to the Captains list.

commit 0d02d20c8d40e34573b483df6dc5e14957d21b01
Author: Rob Tsuk <rob@tsuk.com>
Date:   Wed Jul 16 21:11:52 2014 -0700

    Refactor equipping into a small class hierarchy.

commit 1fb0271b054f337137e98ec8a12718ec29ac2de3
Author: Rob Tsuk <rob@tsuk.com>
Date:   Wed Jul 16 09:39:06 2014 -0700

    Putting DockAppDelegate on a diet.
Set up for Mac beta distribution.
Create a more detailed plain text format.
Start cleaning up the inspector implementation and add Admirals.
More Inspector refactoring.
Create a controller for the squad detail view.
Allow more lines when printing build sheets.
More inspector cleanup.
New Mac test release.
New iOS test release.
Fix some crowded controls and the splitter style in the Mac main window.
Update the move grid as the inspector item changes.
Take out debugging code that was causing the rotation crash.

Fixes #84.
New Android release with less rotational inertia.
Squashed commit of the following:

commit 5c5f2c56ef3271e41b6407d8fe7c8206ad610b82
Author: Rob Tsuk <rob@tsuk.com>
Date:   Mon Jul 28 22:22:20 2014 -0700

    More work on searching on the Mac.

commit c10f36d2a97a8759b36943ea1fc03f5eb8012a03
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sun Jul 27 22:24:54 2014 -0700

    New Android release with less rotational inertia.

commit 1ab15aa2f969593c668c4d89950cb81b0db723ec
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sun Jul 27 22:21:41 2014 -0700

    Take out debugging code that was causing the rotation crash.

    Fixes #84.

commit e84732327072e1411aa58f008ba30ec3c5ec9dd0
Author: Rob Tsuk <rob@tsuk.com>
Date:   Sun Jul 27 09:08:30 2014 -0700

    Work in progress on search for mac.
First cut at source list.
Print build sheets with room to add blind booster ship.