Merge lp:~threeve/ubuntuone-ios-music/the-great-renaming into lp:ubuntuone-ios-music

[Jason Foreman]

Renaming the project and a couple of key classes from 'iSub' to 'U1Music'.

[Zachery Bir (urbanape)]

Approved, with the following diff:

=== modified file 'view_controllers/SettingsViewController.m'
--- view_controllers/SettingsViewController.m 2011-07-11 19:36:38 +0000
+++ view_controllers/SettingsViewController.m 2011-07-27 16:33:38 +0000
@@ -29,7 +29,6 @@
 // DAMAGE.

 #import "SettingsViewController.h"
-#import "iSubAppDelegate.h"
 #import "AboutViewController.h"
 #import "Subsonic.h"
 #import "Downloader.h"

=== modified file 'view_controllers/SongViewController.m'
--- view_controllers/SongViewController.m 2011-06-23 13:54:49 +0000
+++ view_controllers/SongViewController.m 2011-07-27 16:33:30 +0000
@@ -29,7 +29,6 @@
 // DAMAGE.

 #import "SongViewController.h"
-#import "iSubAppDelegate.h"
 #import "StreamingPlayer.h"
 #import "AudioStreamer.h"
 #import "Album.h"

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-07-19 18:56:05 +0000
+++ .bzrignore	2011-07-25 19:46:02 +0000
@@ -1,9 +1,7 @@
-musicstreaming/build
-musicstreaming/iSub.xcodeproj/*.pbxuser
-musicstreaming/iSub.xcodeproj/*.mode1v3
-contacts/iPhoneApp/build
 .DS_STORE
-contacts/funambol-sdk/build/mac/build
 .DS_Store
-musicstreaming/iSub.xcodeproj/xcuserdata
-musicstreaming/iSub.xcodeproj/project.xcworkspace/
+build
+U1Music.xcodeproj/*.pbxuser
+U1Music.xcodeproj/*.mode1v3
+U1Music.xcodeproj/xcuserdata
+U1Music.xcodeproj/project.xcworkspace/
 
=== renamed file 'Other Sources/iSubAppDelegate.h' => 'Other Sources/U1MusicAppDelegate.h'
--- Other Sources/iSubAppDelegate.h	2011-05-27 18:25:16 +0000
+++ Other Sources/U1MusicAppDelegate.h	2011-07-25 19:46:02 +0000
@@ -30,7 +30,7 @@
 
 @class Reachability;
 
-@interface iSubAppDelegate : NSObject <UIApplicationDelegate> {
+@interface U1MusicAppDelegate : NSObject <UIApplicationDelegate> {
     
     UIWindow *window;
     UITabBarController *tabBarController;
 
=== renamed file 'Other Sources/iSubAppDelegate.m' => 'Other Sources/U1MusicAppDelegate.m'
--- Other Sources/iSubAppDelegate.m	2011-07-12 21:35:15 +0000
+++ Other Sources/U1MusicAppDelegate.m	2011-07-25 19:46:02 +0000
@@ -28,7 +28,7 @@
 //  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
 //  DAMAGE.
 
-#import "iSubAppDelegate.h"
+#import "U1MusicAppDelegate.h"
 #import "ArtistListViewController.h"
 #import "AlbumListViewController.h"
 #import "PlaylistListViewController.h"
@@ -39,7 +39,7 @@
 #import "UOMusicLoginController.h"
 #import "URLQueryStringParser.h"
 
-@interface iSubAppDelegate () <UOMusicLoginControllerDelegate>
+@interface U1MusicAppDelegate () <UOMusicLoginControllerDelegate>
 @property (retain) UOMusicLoginController *loginController;
 - (void)recoverState;
 - (void)parseQueryCredentials:(NSURL*)anURL;
@@ -48,7 +48,7 @@
 @end
 
 
-@implementation iSubAppDelegate
+@implementation U1MusicAppDelegate
 
 @synthesize window;
 @synthesize tabBarController;
 
=== renamed file 'iSub-Info.plist' => 'U1Music-Info.plist'
=== renamed directory 'iSub.xcodeproj' => 'U1Music.xcodeproj'
=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- iSub.xcodeproj/project.pbxproj	2011-07-18 14:05:09 +0000
+++ U1Music.xcodeproj/project.pbxproj	2011-07-25 19:46:02 +0000
@@ -116,7 +116,7 @@
 		93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; };
 		93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; };
 		93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; };
-		93F334711247FB78006C6707 /* iSubAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* iSubAppDelegate.m */; };
+		93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; };
 		93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; };
 		93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; };
 		93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; };
@@ -183,7 +183,7 @@
 		53F675DB113B093900822059 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		53F675E1113B095900822059 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		53F675E7113B096400822059 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		8D1107310486CEB800E47090 /* iSub-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iSub-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* U1Music-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "U1Music-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 		91018B0913573BBB0051EFDC /* UIImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Resize.h"; sourceTree = "<group>"; };
 		91018B0A13573BBB0051EFDC /* UIImage+Resize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Resize.m"; sourceTree = "<group>"; };
 		91018B0C13573D150051EFDC /* UIImage+Alpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Alpha.h"; sourceTree = "<group>"; };
@@ -341,12 +341,12 @@
 		93F334641247FB02006C6707 /* SongViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SongViewController.xib; sourceTree = "<group>"; };
 		93F334651247FB02006C6707 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 		93F334661247FB02006C6707 /* SearchableTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchableTableViewController.xib; sourceTree = "<group>"; };
-		93F3346E1247FB78006C6707 /* iSubAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iSubAppDelegate.h; sourceTree = "<group>"; };
-		93F3346F1247FB78006C6707 /* iSubAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iSubAppDelegate.m; sourceTree = "<group>"; };
+		93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1MusicAppDelegate.h; sourceTree = "<group>"; };
+		93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1MusicAppDelegate.m; sourceTree = "<group>"; };
 		93F334701247FB78006C6707 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		93F334731247FB9F006C6707 /* AudioStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamer.h; sourceTree = "<group>"; };
 		93F334741247FB9F006C6707 /* AudioStreamer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStreamer.m; sourceTree = "<group>"; };
-		93F334841247FC15006C6707 /* iSub_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iSub_Prefix.pch; sourceTree = SOURCE_ROOT; };
+		93F334841247FC15006C6707 /* U1Music_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = U1Music_Prefix.pch; path = ../U1Music_Prefix.pch; sourceTree = "<group>"; };
 		93F3348D1247FCDC006C6707 /* ArtistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArtistViewController.h; path = view_controllers/ArtistViewController.h; sourceTree = "<group>"; };
 		93F3348E1247FCDC006C6707 /* ArtistViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = ArtistViewController.m; path = view_controllers/ArtistViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		93F3348F1247FCDC006C6707 /* SongViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = SongViewController.h; path = view_controllers/SongViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -520,7 +520,7 @@
 				93D6B50A1252CA71007880B0 /* music_29.png */,
 				93D6B50D1252CA71007880B0 /* music_512.png */,
 				53F0CD8111589F0A00A665CD /* progress-label-background.png */,
-				8D1107310486CEB800E47090 /* iSub-Info.plist */,
+				8D1107310486CEB800E47090 /* U1Music-Info.plist */,
 				935FCC42123766E600B5DF9B /* Entitlements.plist */,
 				93DFFE4C135D71760061F29F /* music.xcdatamodeld */,
 			);
@@ -770,9 +770,9 @@
 			isa = PBXGroup;
 			children = (
 				93BC520A124C187700B7587C /* SynthesizeSingleton.h */,
-				93F334841247FC15006C6707 /* iSub_Prefix.pch */,
-				93F3346E1247FB78006C6707 /* iSubAppDelegate.h */,
-				93F3346F1247FB78006C6707 /* iSubAppDelegate.m */,
+				93F334841247FC15006C6707 /* U1Music_Prefix.pch */,
+				93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */,
+				93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */,
 				93F334701247FB78006C6707 /* main.m */,
 			);
 			name = Main;
@@ -929,9 +929,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		1D6058900D05DD3D006BFB54 /* iSub */ = {
+		1D6058900D05DD3D006BFB54 /* U1Music */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "iSub" */;
+			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "U1Music" */;
 			buildPhases = (
 				1D60588D0D05DD3D006BFB54 /* Resources */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
@@ -941,7 +941,7 @@
 			);
 			dependencies = (
 			);
-			name = iSub;
+			name = U1Music;
 			productName = iSubTESTING;
 			productReference = 1D6058910D05DD3D006BFB54 /* U1 Music.app */;
 			productType = "com.apple.product-type.application";
@@ -954,7 +954,7 @@
 			attributes = {
 				ORGANIZATIONNAME = Canonical;
 			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iSub" */;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -969,7 +969,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				1D6058900D05DD3D006BFB54 /* iSub */,
+				1D6058900D05DD3D006BFB54 /* U1Music */,
 			);
 		};
 /* End PBXProject section */
@@ -1074,7 +1074,7 @@
 				93F334531247FA2C006C6707 /* Artist.m in Sources */,
 				93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */,
 				93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */,
-				93F334711247FB78006C6707 /* iSubAppDelegate.m in Sources */,
+				93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */,
 				93F334721247FB78006C6707 /* main.m in Sources */,
 				93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */,
 				93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */,
@@ -1158,9 +1158,9 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = iSub_Prefix.pch;
+				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
 				GCC_VERSION = "";
-				INFOPLIST_FILE = "iSub-Info.plist";
+				INFOPLIST_FILE = "U1Music-Info.plist";
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=*]" = "";
@@ -1180,9 +1180,9 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 6;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = iSub_Prefix.pch;
+				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
 				GCC_VERSION = "";
-				INFOPLIST_FILE = "iSub-Info.plist";
+				INFOPLIST_FILE = "U1Music-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
@@ -1234,7 +1234,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "iSub" */ = {
+		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "U1Music" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1D6058940D05DD3E006BFB54 /* Debug */,
@@ -1243,7 +1243,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iSub" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "U1Music" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
 
=== renamed file 'iSub_Prefix.pch' => 'U1Music_Prefix.pch'
=== modified file 'xibs/MainWindow.xib'
--- xibs/MainWindow.xib	2011-05-18 14:26:11 +0000
+++ xibs/MainWindow.xib	2011-07-25 19:46:02 +0000
@@ -2,23 +2,16 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.SystemVersion">11A511</string>
+		<string key="IBDocument.InterfaceBuilderVersion">907</string>
+		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">301</string>
+			<string key="NS.object.0">141</string>
 		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>IBProxyObject</string>
-			<string>IBUITabBarItem</string>
-			<string>IBUIViewController</string>
-			<string>IBUICustomObject</string>
-			<string>IBUITabBarController</string>
-			<string>IBUIWindow</string>
-			<string>IBUITabBar</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -29,7 +22,9 @@
 			<object class="NSArray" key="dict.sortedKeys" id="0">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 			</object>
-			<reference key="dict.values" ref="0"/>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,12 +40,10 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIWindow" id="380026005">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">1316</int>
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -68,7 +61,6 @@
 					<int key="IBUIStatusBarStyle">2</int>
 				</object>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-					<int key="IBUIInterfaceOrientation">1</int>
 					<int key="interfaceOrientation">1</int>
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -85,7 +77,6 @@
 					<reference key="IBUIParentViewController" ref="348272196"/>
 					<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-						<int key="IBUIInterfaceOrientation">1</int>
 						<int key="interfaceOrientation">1</int>
 					</object>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -106,7 +97,6 @@
 						<reference key="IBUIParentViewController" ref="348272196"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
 							<int key="interfaceOrientation">1</int>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -124,7 +114,6 @@
 						<reference key="IBUIParentViewController" ref="348272196"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
 							<int key="interfaceOrientation">1</int>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -142,7 +131,6 @@
 						<reference key="IBUIParentViewController" ref="348272196"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
 							<int key="interfaceOrientation">1</int>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -160,7 +148,6 @@
 						<reference key="IBUIParentViewController" ref="348272196"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
 							<int key="interfaceOrientation">1</int>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -168,11 +155,9 @@
 					</object>
 				</object>
 				<object class="IBUITabBar" key="IBUITabBar" id="252579872">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">266</int>
 					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
 						<bytes key="NSWhite">MCAwAA</bytes>
@@ -373,14 +358,16 @@
 					<object class="NSMutableDictionary">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference key="dict.sortedKeys" ref="0"/>
-						<reference key="dict.values" ref="0"/>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 					</object>
 					<string>{{11, 1059}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>{{112, 1008}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>iSubAppDelegate</string>
+					<string>U1MusicAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -397,13 +384,17 @@
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
 			</object>
 			<nil key="sourceID"/>
 			<int key="maxID">67</int>
@@ -420,6 +411,7 @@
 			<integer value="3100" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -440,6 +432,6 @@
 				<string>{30, 30}</string>
 			</object>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<string key="IBCocoaTouchPluginVersion">141</string>
 	</data>
 </archive>