Merge lp:~urbanape/ubuntuone-ios-music/fix-appserver-base-url into lp:ubuntuone-ios-music

[Zachery Bir]

This branch splits out the URLs for metadata and streaming requests

[Jason Foreman (threeve)]

review: Approve

[lp:~urbanape/ubuntuone-ios-music/fix-appserver-base-url]

214. By Zachery Bir on 2011-11-05

Also use getMetadataURL in various places that ask for it.

=== modified file '.bzrignore'
--- .bzrignore	2011-07-25 16:01:23 +0000
+++ .bzrignore	2011-11-05 00:45:27 +0000
@@ -5,3 +5,4 @@
 U1Music.xcodeproj/*.mode1v3
 U1Music.xcodeproj/xcuserdata
 U1Music.xcodeproj/project.xcworkspace/
+U1TestFlightTeamToken.txt

=== modified file 'Other Sources/U1MusicAppDelegate.h'
--- Other Sources/U1MusicAppDelegate.h	2011-07-25 16:07:02 +0000
+++ Other Sources/U1MusicAppDelegate.h	2011-11-05 00:45:27 +0000
@@ -31,7 +31,6 @@
 @class Reachability;
 
 @interface U1MusicAppDelegate : NSObject <UIApplicationDelegate> {
-    
     UIWindow *window;
     UITabBarController *tabBarController;
 }

=== modified file 'Other Sources/U1MusicAppDelegate.m'
--- Other Sources/U1MusicAppDelegate.m	2011-07-25 16:07:02 +0000
+++ Other Sources/U1MusicAppDelegate.m	2011-11-05 00:45:27 +0000
@@ -45,6 +45,7 @@
 - (void)parseQueryCredentials:(NSURL*)anURL;
 - (BOOL)configureUsernamePassword;
 - (void)presentLoginView;
+- (void)prepareTestFlight;
 @end
 
 
@@ -59,6 +60,8 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {   
+	[self prepareTestFlight];
+
     [self recoverState];
 
     window.backgroundColor = [UIColor viewFlipsideBackgroundColor];
@@ -163,6 +166,26 @@
 	[[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_reloadAccountCredentials object:nil];
 }
 
+- (void)prepareTestFlight;
+{
+	NSString *tokenFilePath = [[NSBundle mainBundle] pathForResource:@"U1TestFlightTeamToken" ofType:@"txt"];
+	if (!tokenFilePath)
+		return;
+	
+	NSError *error = nil;
+	NSString *teamToken = [NSString stringWithContentsOfFile:tokenFilePath usedEncoding:NULL error:&error];
+	
+	if (teamToken)
+	{
+		teamToken = [teamToken stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+		[TestFlight takeOff:teamToken];
+	}
+	else
+	{
+		NSLog(@"error loading TestFlight team token: %@", error);
+	}
+}
+
 #pragma mark -
 #pragma mark Memory management
 

=== added directory 'TestFlight SDK'
=== added file 'TestFlight SDK/README.txt'
--- TestFlight SDK/README.txt	1970-01-01 00:00:00 +0000
+++ TestFlight SDK/README.txt	2011-11-05 00:45:27 +0000
@@ -0,0 +1,160 @@
+Thanks for downloading the TestFlight SDK! 
+
+This document is also availale on the web at https://www.testflightapp.com/sdk/doc
+
+1. Why use the TestFlight SDK?
+2. Considerations
+3. How do I integrate the SDK into my project?
+4. Using the Checkpoint API
+5. Using the Feedback API
+6. Upload your build
+7. Questions API
+8. View your results
+9. Advanced Exception Handling
+
+START
+
+
+1. Why use the TestFlight SDK?
+
+The TestFlight SDK allows you to track how beta testers are testing your application. Out of the box we track simple usage information, such as which tester is using your application, their device model/OS, how long they used the application, logs of their test session, and automatic recording of any crashes they encounter.
+
+To get the most out of the SDK we have provided the Checkpoint API.
+
+The Checkpoint API is used to help you track exactly how your testers are using your application. Curious about which users passed level 5 in your game, or posted their high score to Twitter, or found that obscure feature? With a single line of code you can find gather all this information. Wondering how many times your app has crashed? Wondering who your power testers are? We've got you covered. See more information on the Checkpoint API in section 4.
+
+Alongside the Checkpoint API is the Questions interface. The Questions interface is managed on a per build basis on the TestFlight website. Find out more about the Questions Interface in section 6.
+
+2. Considerations
+
+
+Information gathered by the SDK is sent to the website in real time. When an application is put into the background (iOS 4.x) or terminated (iOS 3.x) we try to send the finalizing information for the session during the time allowed for finalizing the application. Should all of the data not get sent the remaining data will be sent the next time the application is launched. As such, to get the most out of the SDK we recommend your application support iOS 4.0 and higher.
+
+This SDK can be run from both the iPhone Simulator and Device and has been tested using XCode 4.0.
+
+3. How do I integrate the SDK into my project?
+
+
+1. Add the files to your project: Project -> Add to Project -> TestFlightSDK
+
+    1. Copy items into destination folder (if needed): Checked
+    2. Reference Type: Default
+    3. Recursively create groups for added folders
+
+2. Verify that libTestFlight.a has been added to the Link Binary With Libraries Build Phase for the targets you want to use the SDK with
+    
+    1. Select your Project in the Project Navigator
+    2. Select the target you want to enable the SDK for
+    3. Select the Build Phases tab
+    4. Open the Link Binary With Libraries Phase
+    5. If libTestFlight.a is not listed, drag and drop the library from your Project Navigator to the Link Binary With Libraries area
+    6. Repeat Steps 2 - 5 until all targets you want to use the SDK with have the SDK linked
+
+3. In your Application Delegate:
+
+    1. Import TestFlight -> #import "TestFlight.h"
+    NOTE: If you do not want to import TestFlight.h in every file you may add the above line into you precompiled header (<projectname>_Prefix.pch) file inside of the 
+
+            #ifdef __OBJC__ section. 
+        This will give you access to the SDK across all files.
+    2. Get your Team Token which you can find at [http://testflightapp.com/dashboard/team/](http://testflightapp.com/dashboard/team/) select the team you are using then choose edit.
+    3. Launch TestFlight with your Team Token, if you do not currently use an unhandled exception handler you can skip to step 4
+
+            -(BOOL)application:(UIApplication *)application 
+                    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+                [TestFlight takeOff:@"Insert your Team Token here"];
+            }
+
+    4. To report crashes to you we install our own unhandled exception handler. If you are not currently using an exception handler of your own then all you need ot do is go to the next step. If you currently use an Exception Handler, or you use another framework that does please go to the section on advanced exception handling.
+
+4. To enable the best crash reporting possible we recommend setting the following project build settings in XCode to NO for all targets that you want to have live crash reporting for You can find build settings by opening the Project Navigator (default command+1 or command+shift_j) then clicking on the project you are configuring (usually the first selection in the list) from there you can choose to either change the global project settings or settings on an individual project basis. All settings below are in the Deployment Section.
+
+    1. Deployment Postprocessing
+    2. Strip Debug Symbols During Copy
+    3. Strip Linked Product
+
+4. Use the Checkpoint API to create important checkpoints throughout your application.
+
+When a tester passes a level, or adds a new todo item, you can pass a checkpoint.  The checkpoint progress is used to provide insight into how your testers are testing your apps.  The passed checkpoints are also attached to crashes which can help when creating steps to replicate.
+
+[TestFlight passCheckpoint:@"CHECKPOINT_NAME"];
+Use passCheckpoint: to track when a user performs certain tasks in your application. This can be useful for making sure testers are hitting all parts of your application, as well as tracking which testers are being thorough.
+
+5. Using the Feedback API
+
+To launch unguided feedback call the openFeedbackView method. We recommend that you call this from a GUI element. 
+
+    -(IBAction)launchFeedback {
+        [TestFlight openFeedbackView];
+    }
+
+Once users have submitted feedback from inside of the application you can view it in the feedback area of your build page.
+
+6. Upload your build.
+
+After you have integrated the SDK into your application you need to upload your build to TestFlight. You can upload from your dashboard or or using the Upload API, full documentation here https://testflightapp.com/api/doc/ 
+
+7. Add Questions to Checkpoints
+
+In order to ask a question, you'll need to associate it with a checkpoint. Make sure your checkpoints are initialized by running your app and hitting them all yourself before you start adding questions.
+
+There are three question types available: Yes/No, Multiple Choice, and Long Answer.
+
+To create questions, visit your build's Questions page, and click on 'Add Question'. If you choose Multiple Choice, you'll need to enter a list of possible answers for your testers to choose from &mdash; otherwise, you'll only need to enter your question's, well, question. If your build has no questions, you can also choose to migrate questions from another build (because seriously &mdash; who wants to do all that typing again)?
+
+After restarting your application on an approved device when you pass the checkpoint associated with your questions a Test Flight modal question form will appear on the screen asking the beta tester to answer your question.
+
+After you upload a new build to TestFlight you will need to associate questions once again. However if your checkpoints and questions have remained the same you can choose "copy questions from an older build" and choose which build to copy the questions from.
+
+8. View your results.
+
+As testers install your build and start to test it you will see their session data on the web on the build report page for the build you've uploaded.
+
+9. Advanced Exception Handling
+
+An unhandled exception means that your application is in an unknown state and there is not much that you can do but try and exit gracefully. Our SDK does its best to get the data we collect in this situation to you while it is crashing but it is designed in such a way that the important act of saving the data occurs in as safe way a way as possible before trying to send anything. If you do use unhandled exception or signal handlers install your handlers before calling takeOff our SDK will then call your handler while ours is running. For example:
+
+            /*
+             My Apps Custom unhandled exception catcher, we do special stuff here, and TestFlight takes care of the rest
+            **/
+            void HandleExceptions(NSException *exception) {
+                NSLog(@"This is where we save the application data during a exception");
+                // Save application data on crash
+            }
+            /*
+             My Apps Custom signal catcher, we do special stuff here, and TestFlight takes care of the rest
+            **/
+            void SignalHandler(int sig) {
+                NSLog(@"This is where we save the application data during a signal");
+                // Save application data on crash
+            }
+
+            -(BOOL)application:(UIApplication *)application 
+                    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {    
+                // installs HandleExceptions as the Uncaught Exception Handler
+                NSSetUncaughtExceptionHandler(&HandleExceptions);
+                // create the signal action structure 
+                struct sigaction newSignalAction;
+                // intialize the signal action structure
+                memset(&newSignalAction, 0, sizeof(newSignalAction));
+                // set SignalHandler as the handler in the signal action structure
+                newSignalAction.sa_handler = &SignalHandler;
+                // set SignalHandler as the handlers for SIGABRT, SIGILL and SIGBUS
+                sigaction(SIGABRT, &newSignalAction, NULL);
+                sigaction(SIGILL, &newSignalAction, NULL);
+                sigaction(SIGBUS, &newSignalAction, NULL);
+                // Call takeOff after install your own unhandled exception and signal handlers
+                [TestFlight takeOff:@"Insert your Team Token here"];
+                // continue with your application intialization
+            }
+
+You do not need to add the above code if your application does not use exception handling already.
+
+END
+
+Please contact us if you have any questions.
+
+The TestFlight Team
+
+w. http://www.testflightapp.com
+e. [e-mail]

=== added file 'TestFlight SDK/TestFlight.h'
--- TestFlight SDK/TestFlight.h	1970-01-01 00:00:00 +0000
+++ TestFlight SDK/TestFlight.h	2011-11-05 00:45:27 +0000
@@ -0,0 +1,35 @@
+//
+//  TestFlight.h
+//  libTestFlight
+//
+//  Created by Colin Humber on 8/25/10.
+//  Copyright 2010 23 Divide Apps. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+@interface TestFlight : NSObject {
+
+}
+
+/**
+ Add custom environment information
+ If you want to track a user name from your application you can add it here
+ */
++ (void)addCustomEnvironmentInformation:(NSString *)information forKey:(NSString*)key;
+
+/**
+ Starts a TestFlight session
+ */
++ (void)takeOff:(NSString *)teamToken;
+
+/**
+ Track when a user has passed a checkpoint after the flight has taken off. Eg. passed level 1, posted high score
+ */
++ (void)passCheckpoint:(NSString *)checkpointName;
+
+/**
+ Opens a feeback window that is not attached to a checkpoint
+ */
++ (void)openFeedbackView;
+
+@end

=== added file 'TestFlight SDK/libTestFlight.a'
Binary files TestFlight SDK/libTestFlight.a	1970-01-01 00:00:00 +0000 and TestFlight SDK/libTestFlight.a	2011-11-05 00:45:27 +0000 differ
=== added file 'TestFlight SDK/release_notes.txt'
--- TestFlight SDK/release_notes.txt	1970-01-01 00:00:00 +0000
+++ TestFlight SDK/release_notes.txt	2011-11-05 00:45:27 +0000
@@ -0,0 +1,21 @@
+0.5 - August 19, 2011
+Feedback that is not attached to a checkpoint [TestFlight openFeedbackView]
+Usability changes to question views
+Removed pause and resume sessions, replaced with sessions being stopped and started
+Added text autocorrection to the Long Answer question type
+Crash reports now send on crash instead of next launch
+0.4 - August 15, 2011
+In Application Feedback with Questions
+In application updates
+Custom Environment Information added
+Networking stack reimplementation
+Exception handling fixes
+0.3 - June 15, 2011
+Removed all mention of JSONKit from the README
+Added support for using both the Bundle Version and the Bundle Short Version string
+0.2 - June 14, 2011
+Removed all categories this allows users to use the SDK without having to set -ObjC and -load_all
+Prefixed JSONKit for use in TestFlight to remove reported issues where some users were already using JSONKit
+Added support for armv6 again
+0.1 - June 11, 2011
+Initial Version
\ No newline at end of file

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2011-08-03 18:31:39 +0000
+++ U1Music-Info.plist	2011-11-05 00:45:27 +0000
@@ -6,8 +6,6 @@
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleDocumentTypes</key>
-	<array/>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -41,7 +39,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>22</string>
+	<string>26</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>
@@ -54,9 +52,5 @@
 	<true/>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleBlackOpaque</string>
-	<key>UTExportedTypeDeclarations</key>
-	<array/>
-	<key>UTImportedTypeDeclarations</key>
-	<array/>
 </dict>
 </plist>

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2011-08-03 18:24:49 +0000
+++ U1Music.xcodeproj/project.pbxproj	2011-11-05 00:45:27 +0000
@@ -47,6 +47,9 @@
 		912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; };
 		912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; };
 		912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; };
+		9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91328279144E07EA00395F40 /* libTestFlight.a */; };
+		9132827E144E07EA00395F40 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827A144E07EA00395F40 /* README.txt */; };
+		9132827F144E07EA00395F40 /* release_notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827B144E07EA00395F40 /* release_notes.txt */; };
 		91406E9413849F2400A7DA67 /* cached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E8E13849F2400A7DA67 /* cached.png */; };
 		91406E9513849F2400A7DA67 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91406E8F13849F2400A7DA67 /* [e-mail] */; };
 		91406E9613849F2400A7DA67 /* partiallycached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9013849F2400A7DA67 /* partiallycached.png */; };
@@ -233,6 +236,10 @@
 		912D392113311F2500A443B2 /* AlbumListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AlbumListViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		912D392413311FC400A443B2 /* SongListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongListViewController.h; sourceTree = "<group>"; };
 		912D392513311FC400A443B2 /* SongListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongListViewController.m; sourceTree = "<group>"; };
+		91328279144E07EA00395F40 /* libTestFlight.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTestFlight.a; sourceTree = "<group>"; };
+		9132827A144E07EA00395F40 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
+		9132827B144E07EA00395F40 /* release_notes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.txt; sourceTree = "<group>"; };
+		9132827C144E07EA00395F40 /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFlight.h; sourceTree = "<group>"; };
 		91406E8E13849F2400A7DA67 /* cached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cached.png; sourceTree = "<group>"; };
 		91406E8F13849F2400A7DA67 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		91406E9013849F2400A7DA67 /* partiallycached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = partiallycached.png; sourceTree = "<group>"; };
@@ -455,6 +462,7 @@
 				536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */,
 				93A54024123188880048BC3D /* Security.framework in Frameworks */,
 				93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */,
+				9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -622,6 +630,17 @@
 			name = Parsers;
 			sourceTree = "<group>";
 		};
+		91328278144E07EA00395F40 /* TestFlight SDK */ = {
+			isa = PBXGroup;
+			children = (
+				91328279144E07EA00395F40 /* libTestFlight.a */,
+				9132827A144E07EA00395F40 /* README.txt */,
+				9132827B144E07EA00395F40 /* release_notes.txt */,
+				9132827C144E07EA00395F40 /* TestFlight.h */,
+			);
+			path = "TestFlight SDK";
+			sourceTree = "<group>";
+		};
 		9316628512264A74003B0EB7 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
@@ -833,6 +852,7 @@
 		964FA39013CA5BE60018A65B /* Dependencies */ = {
 			isa = PBXGroup;
 			children = (
+				91328278144E07EA00395F40 /* TestFlight SDK */,
 				964FA39213CA5C040018A65B /* JSONKit */,
 				964FA39713CA5C040018A65B /* oauthconsumer */,
 			);
@@ -936,9 +956,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "U1Music" */;
 			buildPhases = (
-				1D60588D0D05DD3D006BFB54 /* Resources */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
 				1D60588F0D05DD3D006BFB54 /* Frameworks */,
+				913A54A81450C1310081FD67 /* Run Script */,
+				1D60588D0D05DD3D006BFB54 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -1039,11 +1060,31 @@
 				964FB0C213CB8B0C00D13DC3 /* header_bg.png in Resources */,
 				964FB0C613CB8B6A00D13DC3 /* [e-mail] in Resources */,
 				91DB6B9F13E9C7190029BC77 /* about_logo.png in Resources */,
+				9132827E144E07EA00395F40 /* README.txt in Resources */,
+				9132827F144E07EA00395F40 /* release_notes.txt in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		913A54A81450C1310081FD67 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "\nif [ -f ${SRCROOT}/U1TestFlightTeamToken.txt ]\nthen\n\ncp \"${SRCROOT}/U1TestFlightTeamToken.txt\" \"${CODESIGNING_FOLDER_PATH}\"\n\nelse \n\necho \"warning: ${SRCROOT}/U1TestFlightTeamToken.txt does not exist.  Create this file and paste the Ubuntu One TestFlight team token into it to enable TestFlight SDK analytics.\"\n\nfi\n\n\n#echo \"foo\" > ${CODESIGNING_FOLDER_PATH}/foo.plist\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		1D60588E0D05DD3D006BFB54 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -1153,6 +1194,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
@@ -1163,8 +1208,12 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				INFOPLIST_FILE = "U1Music-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/TestFlight SDK\"",
+				);
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=*]" = "";
@@ -1178,6 +1227,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					armv7,
+				);
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -1185,9 +1238,13 @@
 				CURRENT_PROJECT_VERSION = 6;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = U1Music_Prefix.pch;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				INFOPLIST_FILE = "U1Music-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/TestFlight SDK\"",
+				);
 				PRODUCT_NAME = "U1 Music";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";

=== modified file 'U1Music_Prefix.pch'
--- U1Music_Prefix.pch	2011-07-25 15:56:49 +0000
+++ U1Music_Prefix.pch	2011-11-05 00:45:27 +0000
@@ -16,6 +16,7 @@
 	#import "MOC.h"
 	#import "NSManagedObjectContext+Additions.h"
 	#import "SFHFKeychainUtils.h"
+    #import "TestFlight.h"
  	#define RELEASE_SAFELY(__obj) [__obj release], __obj = nil;
 
 	#define UBUNTU_ONE_SERVICE_NAME @"com.ubuntu.one"

=== modified file 'about_logo.png'
Binary files about_logo.png	2011-08-03 18:24:10 +0000 and about_logo.png	2011-11-05 00:45:27 +0000 differ
=== modified file 'controls/AlertPrompt.m'
--- controls/AlertPrompt.m	2011-04-07 16:08:33 +0000
+++ controls/AlertPrompt.m	2011-11-05 00:45:27 +0000
@@ -30,7 +30,7 @@
     {
         UITextField *theTextField = [[UITextField alloc] initWithFrame:CGRectMake(12.0, 45.0, 260.0, 25.0)]; 
         theTextField.placeholder = placeholder;
-        theTextField.backgroundColor = [UIColor clearColor];
+        theTextField.backgroundColor = [UIColor whiteColor];
         theTextField.borderStyle = UITextBorderStyleRoundedRect;
         [self addSubview:theTextField];
         self.textField = theTextField;

=== modified file 'models/Album.m'
--- models/Album.m	2011-06-18 02:04:11 +0000
+++ models/Album.m	2011-11-05 00:45:27 +0000
@@ -85,7 +85,7 @@
 	
 	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.albumId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getAlbum.view" parameters:parameters];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getAlbum.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 	
 	AlbumParser *parser = [[AlbumParser alloc] init];

=== modified file 'models/Artist.m'
--- models/Artist.m	2011-06-18 02:04:11 +0000
+++ models/Artist.m	2011-11-05 00:45:27 +0000
@@ -101,7 +101,7 @@
 	
 	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.artistId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getMusicDirectory.view" parameters:parameters];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getMusicDirectory.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 	ArtistParser *parser = [[ArtistParser alloc] init];
 	parser.artistManagedObjectID = [self objectID];

=== modified file 'models/Playlist.m'
--- models/Playlist.m	2011-06-18 02:04:11 +0000
+++ models/Playlist.m	2011-11-05 00:45:27 +0000
@@ -63,7 +63,7 @@
 	
 	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlistId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getPlaylist.view" parameters:parameters];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getPlaylist.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 	
 	PlaylistParser *parser = [[PlaylistParser alloc] init];

=== modified file 'music_29.png'
Binary files music_29.png	2011-08-03 18:23:53 +0000 and music_29.png	2011-11-05 00:45:27 +0000 differ
=== modified file 'music_512.png'
Binary files music_512.png	2011-08-03 18:23:53 +0000 and music_512.png	2011-11-05 00:45:27 +0000 differ
=== modified file 'music_57.png'
Binary files music_57.png	2011-08-03 18:23:53 +0000 and music_57.png	2011-11-05 00:45:27 +0000 differ
=== modified file '[e-mail]'
Binary files [e-mail]	2011-08-03 18:23:53 +0000 and [e-mail]	2011-11-05 00:45:27 +0000 differ
=== modified file 'utilities/Subsonic.h'
--- utilities/Subsonic.h	2011-06-18 02:04:11 +0000
+++ utilities/Subsonic.h	2011-11-05 00:45:27 +0000
@@ -33,7 +33,8 @@
 }
 @property BOOL hasCredentials;
 @property(nonatomic,retain) NSString *credsURL;
-@property(nonatomic,retain) NSString *defaultURL;
+@property(nonatomic,retain) NSString *metadataURL;
+@property(nonatomic,retain) NSString *streamingURL;
 @property(nonatomic,retain) NSString *defaultUserName;
 @property(nonatomic,retain) NSString *defaultPassword;
 @property(nonatomic,retain) NSString *cachedIP;
@@ -41,9 +42,10 @@
 @property (readonly, retain) Reachability *reachability;
 + (Subsonic *)sharedSubsonic;
 - (NSURL *)getCredsURL;
-- (NSURL *)getBaseURL:(NSString *)action;
-- (NSURL *)getBaseURL:(NSString *)action parameters:(NSArray*)extraParameters;
+- (NSURL *)getMetadataURL:(NSString *)action;
+- (NSURL *)getMetadataURL:(NSString *)action parameters:(NSArray *)extraParameters;
 - (NSURL *)getStreamingURLForSongId:(NSString*)songId;
+- (NSURL *)buildURLWithBase:(NSString *)baseURL action:(NSString *)action parameters:(NSArray *)extraParameters;
 - (void)removeCredentials;
 - (void)storeUsername:(NSString*)username password:(NSString*)password;
 @end

=== modified file 'utilities/Subsonic.m'
--- utilities/Subsonic.m	2011-08-03 18:25:07 +0000
+++ utilities/Subsonic.m	2011-11-05 00:45:27 +0000
@@ -31,7 +31,7 @@
 
 
 @implementation Subsonic
-@synthesize credsURL, defaultURL, defaultUserName, defaultPassword, cachedIP, cachedIPHour;
+@synthesize credsURL, metadataURL, streamingURL, defaultUserName, defaultPassword, cachedIP, cachedIPHour;
 @synthesize reachability;
 @dynamic hasCredentials;
 
@@ -41,9 +41,10 @@
 {
 	if ((self = [super init]))
 	{
-        self.defaultURL = @"https://streaming.one.ubuntu.com/rest";
+        self.streamingURL = @"https://streaming.one.ubuntu.com/rest";
+		self.metadataURL = @"https://one.ubuntu.com/music/api/1.0";
         self.credsURL = @"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-music";
-		self.reachability = [Reachability reachabilityWithHostName:[[NSURL URLWithString:self.defaultURL] host]];
+		self.reachability = [Reachability reachabilityWithHostName:[[NSURL URLWithString:self.metadataURL] host]];
 		[self.reachability startNotifer];
 	}
 	return self;
@@ -51,7 +52,8 @@
 
 - (void)dealloc;
 {
-	self.defaultURL = nil;
+	self.metadataURL = nil;
+	self.streamingURL = nil;
 	self.credsURL = nil;
 	[self.reachability stopNotifer];
 	self.reachability = nil;
@@ -98,7 +100,7 @@
 {
     NSMutableArray *parameters = [NSMutableArray array];
     [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", songId, nil]];
-	return [self getBaseURL:@"stream.view" parameters:parameters];
+	return [self buildURLWithBase:self.streamingURL action:@"stream.view" parameters:parameters];
 }
 
 - (NSURL *)getCredsURL
@@ -106,12 +108,17 @@
     return [NSURL URLWithString:self.credsURL];
 }
 
-- (NSURL *)getBaseURL:(NSString *)action
-{
-	return [self getBaseURL:action parameters:nil];
-}
-
-- (NSURL *)getBaseURL:(NSString *)action parameters:(NSArray*)extraParameters
+- (NSURL *)getMetadataURL:(NSString *)action;
+{
+	return [self buildURLWithBase:self.metadataURL action:action parameters:nil];
+}
+
+- (NSURL *)getMetadataURL:(NSString *)action parameters:(NSArray *)extraParameters;
+{
+	return [self buildURLWithBase:self.metadataURL action:action parameters:extraParameters];
+}
+
+- (NSURL *)buildURLWithBase:(NSString *)baseURL action:(NSString *)action parameters:(NSArray *)extraParameters;
 {
 	if (self.defaultUserName && self.defaultPassword)
 	{
@@ -122,7 +129,7 @@
 		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"v", @"1.1.0", nil]];
 		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"c", @"Ubuntu One Music iOS", nil]];
         
-		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?%@", self.defaultURL, action, [params urlEncodedString]]];
+		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?%@", baseURL, action, [params urlEncodedString]]];
         return url;
 	}
 	else

=== modified file 'utilities/operations/AlbumArtLoader.m'
--- utilities/operations/AlbumArtLoader.m	2011-06-21 15:29:37 +0000
+++ utilities/operations/AlbumArtLoader.m	2011-11-05 00:45:27 +0000
@@ -134,7 +134,7 @@
 	// Always get the largest we can handle
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"size", [NSString stringWithFormat:@"%d", 640], nil]];
 	
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getCoverArt.view" parameters:parameters];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getCoverArt.view" parameters:parameters];
 	return [url absoluteString];
 }
 

=== modified file 'view_controllers/PlaylistEditViewController.m'
--- view_controllers/PlaylistEditViewController.m	2011-06-21 17:04:19 +0000
+++ view_controllers/PlaylistEditViewController.m	2011-11-05 00:45:27 +0000
@@ -76,7 +76,7 @@
     {
         [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"songId", song.songId, nil]];
     }
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"createPlaylist.view" parameters:extraParameters];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"createPlaylist.view" parameters:extraParameters];
     NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
     NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
     [connection start];

=== modified file 'view_controllers/PlaylistViewController.m'
--- view_controllers/PlaylistViewController.m	2011-06-23 18:40:19 +0000
+++ view_controllers/PlaylistViewController.m	2011-11-05 00:45:27 +0000
@@ -250,7 +250,7 @@
 		{
 			NSMutableArray *extraParameters = [NSMutableArray array];
 			[extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
-			NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"deletePlaylist.view" parameters:extraParameters];
+			NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"deletePlaylist.view" parameters:extraParameters];
 			NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
 			NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
 			[connection start];

=== modified file 'view_controllers/SubsonicTableViewController.m'
--- view_controllers/SubsonicTableViewController.m	2011-07-12 21:35:15 +0000
+++ view_controllers/SubsonicTableViewController.m	2011-11-05 00:45:27 +0000
@@ -270,7 +270,7 @@
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:self.viewName];
+	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:self.viewName];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 	
 	[xmlParser setDelegate:self.parserDelegate];

=== modified file 'xibs/MainWindow.xib'
--- xibs/MainWindow.xib	2011-07-25 16:07:02 +0000
+++ xibs/MainWindow.xib	2011-11-05 00:45:27 +0000
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
-		<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>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">141</string>
+			<string key="NS.object.0">933</string>
 		</object>
-		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<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>
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,10 +42,12 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIWindow" id="380026005">
-				<nil key="NSNextResponder"/>
+				<reference 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>
@@ -61,22 +65,24 @@
 					<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>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUIViewController" key="IBUISelectedViewController" id="698427716">
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="840458441">
-						<string key="IBUITitle">Artists</string>
+				<object class="IBUIViewController" key="IBUISelectedViewController" id="689134606">
+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="255674645">
+						<string key="IBUITitle">Playlists</string>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">artists.png</string>
+							<string key="NSResourceName">playlists.png</string>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<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>
@@ -84,7 +90,24 @@
 				</object>
 				<object class="NSMutableArray" key="IBUIViewControllers">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<reference ref="698427716"/>
+					<object class="IBUIViewController" id="698427716">
+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="840458441">
+							<string key="IBUITitle">Artists</string>
+							<object class="NSCustomResource" key="IBUIImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">artists.png</string>
+							</object>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<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>
+						<bool key="IBUIHorizontal">NO</bool>
+					</object>
 					<object class="IBUIViewController" id="639240297">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="52392059">
 							<string key="IBUITitle">Albums</string>
@@ -97,6 +120,7 @@
 						<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>
@@ -114,28 +138,13 @@
 						<reference key="IBUIParentViewController" ref="348272196"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="interfaceOrientation">1</int>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIHorizontal">NO</bool>
-					</object>
-					<object class="IBUIViewController" id="689134606">
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="255674645">
-							<string key="IBUITitle">Playlists</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">playlists.png</string>
-							</object>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
-						<reference key="IBUIParentViewController" ref="348272196"/>
-						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="interfaceOrientation">1</int>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIHorizontal">NO</bool>
-					</object>
+							<int key="IBUIInterfaceOrientation">1</int>
+							<int key="interfaceOrientation">1</int>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<bool key="IBUIHorizontal">NO</bool>
+					</object>
+					<reference ref="689134606"/>
 					<object class="IBUIViewController" id="621921691">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="174212653">
 							<string key="IBUITitle">Settings</string>
@@ -148,6 +157,7 @@
 						<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>
@@ -155,9 +165,11 @@
 					</object>
 				</object>
 				<object class="IBUITabBar" key="IBUITabBar" id="252579872">
-					<nil key="NSNextResponder"/>
+					<reference 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>
@@ -171,6 +183,14 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">window</string>
 						<reference key="source" ref="664661524"/>
 						<reference key="destination" ref="380026005"/>
@@ -179,14 +199,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="664661524"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">tabBarController</string>
 						<reference key="source" ref="664661524"/>
 						<reference key="destination" ref="348272196"/>
@@ -207,7 +219,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -331,11 +345,11 @@
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
+					<string>-1.IBPluginDependency</string>
 					<string>-2.CustomClassName</string>
+					<string>-2.IBPluginDependency</string>
 					<string>2.IBAttributePlaceholdersKey</string>
-					<string>2.IBEditorWindowLastContentRect</string>
 					<string>2.IBPluginDependency</string>
-					<string>21.IBEditorWindowLastContentRect</string>
 					<string>21.IBPluginDependency</string>
 					<string>22.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
@@ -354,17 +368,15 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>UIApplication</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIResponder</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<object class="NSMutableDictionary">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<reference key="dict.sortedKeys" ref="0"/>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
+						<reference key="dict.values" ref="0"/>
 					</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>U1MusicAppDelegate</string>
@@ -384,17 +396,13 @@
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="activeLocalization"/>
 			<object class="NSMutableDictionary" key="localizations">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<reference key="dict.sortedKeys" ref="0"/>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
+				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
 			<int key="maxID">67</int>
@@ -402,16 +410,11 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<integer value="1056" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<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>
@@ -432,6 +435,6 @@
 				<string>{30, 30}</string>
 			</object>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">141</string>
+		<string key="IBCocoaTouchPluginVersion">933</string>
 	</data>
 </archive>