gistify292904.m

On branch roderic-development
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   AetherCommon/AetherObjects/MorseUser.m
	modified:   AetherCommon/ServerAPIs/AetherAPIClient.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/AccountCreationProgressViewController.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/DeviceSettingsTableViewController.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/MRSETroubleshootTableViewController.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/MRSETroubleshootTableViewController.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/MorseToggleSwitch.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/MorseToggleSwitch.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsMainTableViewController.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsMainTableViewController.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsTableViewCell.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsTableViewCell.m
	modified:   Catalina/CatalinaUI/MainLayer/settings/SettingsTableViewController.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsTableViewDoubleCell.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/SettingsTableViewDoubleCell.m
	deleted:    Catalina/CatalinaUI/MainLayer/settings/TriangleView.h
	deleted:    Catalina/CatalinaUI/MainLayer/settings/TriangleView.m
	deleted:    Catalina/CatalinaUI/menus/MenuBackgroundViewController.h
	deleted:    Catalina/CatalinaUI/menus/MenuBackgroundViewController.m
	deleted:    Catalina/CatalinaUI/menus/cells/SingleCell.h
	deleted:    Catalina/CatalinaUI/menus/cells/SingleCell.m
	modified:   Catalina/CatalinaUI/provisioning/MRSETutorialPageViewController.m
	modified:   SoundCommon/MusicObjects/BaseObjects/TuneObject.m
	deleted:    SoundCommon/MusicObjects/MusicObjects_ios/itunes/ITunesTrack.h
	deleted:    SoundCommon/MusicObjects/MusicObjects_ios/itunes/ITunesTrack.m
	modified:   SoundCommon/MusicObjects/SessionManagement/Session.h
	deleted:    SoundCommon/Player_ios/Deprecated/TunePlayer/PureDataPlayer/pd player utils/CAXException.cpp
	deleted:    SoundCommon/Player_ios/Deprecated/TunePlayer/PureDataPlayer/pd player utils/CAXException.h
	deleted:    SoundCommon/Player_ios/butter/MorsePlayerProtocol.h
	deleted:    SoundCommon/Speech_ios/CAXException.cpp
	deleted:    SoundCommon/Speech_ios/CAXException.h
	deleted:    SoundCommon/Speech_ios/Streamer.h
	deleted:    SoundCommon/Speech_ios/Streamer.m
	deleted:    ext_frameworks/FSNetworking/README.md
	deleted:    ext_frameworks/FSNetworking/license.txt
	deleted:    ext_frameworks/FSNetworking/src/FSN_categories.h
	deleted:    ext_frameworks/FSNetworking/src/FSN_categories.m

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:   Catalina/Catalina.xcodeproj/project.pbxproj
	both modified:   Catalina/Catalina/TuneAppDelegate.h
	both modified:   Catalina/Catalina/TuneAppDelegate.m
	both modified:   Catalina/CatalinaUI/provisioning/ProvisioningController.h
	both modified:   Catalina/CatalinaUI/provisioning/ProvisioningController.m
	both modified:   Catalina/Communications Manager/CommController.h
	both modified:   SoundCommon/MusicObjects/BigBoss/TuneMusicManager.m
	both modified:   SoundCommon/MusicObjects/MusicObjects_ios/SessionsManagement/LocalSession.h
	both modified:   SoundCommon/MusicObjects/SessionManagement/Session.m
	deleted by them: SoundCommon/Player_ios/butter/MorsePlayer.h
	deleted by them: SoundCommon/Player_ios/butter/MorsePlayer.mm