junk commit to make xcode merge work
MERGE OF MAK—TESTING BRANCH
-Changes to improve handling of input of MAK’s for multiple TiVo’s
-User can now ignore a TiVo
-The TiVo editor has been updated to allow for Enabling and Disabling TiVos individually
-Help has been added for user to find their MAK
Cleanups for new MAK code:
    Rely on updateTivoDefaults in getMediaKeyfromUser
    Fix double “Incorrect” in prompt
    Fixes for Bonjour Tivos being enabled (and needing refresh) or disabled (and needing to not update)
Related to MAK code:
	Check manualTiVoID in updateTivoDefaults and updateTivo
	Simplify addManual in ManualTivoEditorController
	Edited MAK help file to point to Edit Tivos to re-enable
Added recheck queue upon a progress stall with no reschedule in MTDownload>checkStillActive
Removed vestiges of KMTManualTivos and KMTMediaKeys
Minor changes:
	Changed log level in Task to get major state changes at Detail level without all the status msgs
	Removed unused var mk
	Removed double “Incorrect” in MAK message
	Removed unused variable tivoGlobalManager.mainWindow

removed debugging code that shouldn’t be there.

- Update all XIB file to 5.0
- Added [updatedSavedTiVos addObject:tiVoDict]; to updateTiVoDefaults: to add new tiros to the User prefs.
- Added help message to network spinner if going for 15 sec. (Adjustable in the MTConstants file)-Fixed initial display of advPref to be the correct size
-Added script to build for code signing for 10.9
-Added script to build for bundle number for git (not correct yet)
-Update sparkle pointer to github repository
-Rolled rev to 2.2