Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui

Conflicts: Classes/AboutViewController.h Classes/AboutViewController.m Classes/AboutViewController.xib Classes/ChatRoomTableViewController.m Classes/ChatRoomViewController.m Classes/ChatTableViewController.m Classes/ContactDetailsTableViewController.m Classes/ContactDetailsViewController.m Classes/ContactsTableViewController.m Classes/HistoryDetailsViewController.m Classes/HistoryTableViewController.m Classes/HistoryViewController.m Classes/ImageViewController.h Classes/ImageViewController.m Classes/InCallTableViewController.h Classes/InCallTableViewController.m Classes/InCallViewController.m Classes/IncomingCallViewController.h Classes/IncomingCallViewController.m Classes/LinphoneAppDelegate.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICallCell.h Classes/LinphoneUI/UICallCell.m Classes/LinphoneUI/UIChatCell.m Classes/LinphoneUI/UIChatRoomCell.m Classes/LinphoneUI/UIChatRoomCell.xib Classes/LinphoneUI/UICompositeViewController.m Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/UIMainBar.m Classes/LinphoneUI/UIStateBar.m Classes/LinphoneUI/en.lproj/UICallBar.xib Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib Classes/LinphoneUI/en.lproj/UICallCell.xib Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib Classes/LinphoneUI/fr.lproj/UICallBar.xib Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib Classes/LinphoneUI/fr.lproj/UICallCell.xib Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib Classes/PhoneMainView.m Classes/SettingsViewController.m Classes/WizardViewController.h Classes/WizardViewController.m Classes/en.lproj/DialerViewController.xib Classes/en.lproj/IncomingCallViewController.xib Classes/fr.lproj/DialerViewController.xib Classes/fr.lproj/IncomingCallViewController.xib Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings Settings.bundle/Root.plist Settings/InAppSettings.bundle/en.lproj/Audio.strings Settings/InAppSettings.bundle/fr.lproj/Audio.strings linphone-Info.plist linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib linphone.ldb/Resources/Classes/ImageViewController/11/ImageViewController.xib linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/8/UICallBar~ipad.xib linphone.ldb/Resources/LinphoneUI/UICallCell/10/UICallCell.xib linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj submodules/build/builders.d/openssl.mk
2026-01-26 23:58:17 +00:00 · 2012-10-10 13:00:18 +02:00 · 2012-10-10 13:00:18 +02:00 · d2253e0532
commit d2253e0532
parent bf0300cee9 da5488e866
27 changed files with 484 additions and 5561 deletions
--- a/Classes/BuschJaegerCallView.m
+++ b/Classes/BuschJaegerCallView.m
@ -186,7 +186,7 @@
        case LinphoneCallOutgoingRinging:
 		case LinphoneCallConnected:
 		case LinphoneCallStreamsRunning:
-        case LinphoneCallUpdated:
+        case LinphoneCallUpdating:
        {
            [[LinphoneManager instance] setSpeakerEnabled:TRUE];
 			//check video
--- a/Classes/BuschJaegerConfiguration.m
+++ b/Classes/BuschJaegerConfiguration.m
@ -513,7 +513,7 @@
        NSArray *anchors = (NSArray*)certificates;
        SecTrustSetAnchorCertificates(trust, (CFArrayRef)anchors);
        SecTrustSetAnchorCertificatesOnly(trust, YES);
-        SecPolicyCreateBasicX509()
+
        SecTrustResultType result = kSecTrustResultInvalid;
        OSStatus sanityChesk = SecTrustEvaluate(trust, &result);
        
--- a/Classes/BuschJaegerMainView.m
+++ b/Classes/BuschJaegerMainView.m
@ -195,7 +195,7 @@ static BuschJaegerMainView* mainViewInstance=nil;
        }
        case LinphoneCallPausedByRemote:
 		case LinphoneCallConnected:
-        case LinphoneCallUpdated:
+        case LinphoneCallUpdating:
        {
            [navigationController popToViewController:welcomeView animated:FALSE];
            [navigationController pushViewController:callView animated:FALSE]; // No animation... Come back when Apple have learned how to create a good framework
--- a/Classes/LinphoneAppDelegate.h
+++ b/Classes/LinphoneAppDelegate.h
@ -19,7 +19,7 @@

 #import <UIKit/UIKit.h>
 #import <AddressBookUI/ABPeoplePickerNavigationController.h>
-#import <CoreTelephony/CTCallCenter.h>
+

@interface UILinphoneWindow : UIWindow

@ -28,9 +28,9 @@
@interface LinphoneAppDelegate : NSObject <UIApplicationDelegate,UIAlertViewDelegate> {
    @private
 	UIWindow *window;
-    CTCallCenter* callCenter;
    BOOL started;
 	int savedMaxCall;
+	
 }

@property (assign) BOOL started;
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@ -53,17 +53,7 @@

 #pragma mark - 

- (void)handleGSMCallInteration: (id) cCenter {
-    CTCallCenter* ct = (CTCallCenter*) cCenter;
-    
-    int callCount = [ct.currentCalls count];
-     /* pause current call, if any */
-     LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
-     if (callCount>0 && call) {
-          [LinphoneLogger logc:LinphoneLoggerLog format:"Pausing SIP call"];
-          linphone_core_pause_call([LinphoneManager getLc], call);
-      }
-}
+

 - (void)applicationDidEnterBackground:(UIApplication *)application{
 	[LinphoneLogger logc:LinphoneLoggerLog format:"applicationDidEnterBackground"];
@ -91,13 +81,7 @@
 	}
    
    if (![[LinphoneManager instance] resignActive]) {
-        // destroying eventHandler if app cannot go in background.
-        // Otherwise if a GSM call happen and Linphone is resumed,
-        // the handler will be called before LinphoneCore is built.
-        // Then handler will be restored in appDidBecomeActive cb
-        callCenter.callEventHandler = nil;
-        [callCenter release];
-        callCenter = nil;
+
    }
    
 }
@ -108,8 +92,6 @@
    
 	[[LinphoneManager instance] becomeActive];
    
-    // check call state at startup
-    [self handleGSMCallInteration:callCenter];
    
    LinphoneCore* lc = [LinphoneManager getLc];
    LinphoneCall* call = linphone_core_get_current_call(lc);
@ -128,17 +110,7 @@
 	}
 }

- (void)setupGSMInteraction {
-    if (callCenter == nil) {
-        callCenter = [[CTCallCenter alloc] init];
-        callCenter.callEventHandler = ^(CTCall* call) {
-            // post on main thread
-            [self performSelectorOnMainThread:@selector(handleGSMCallInteration:)
-                               withObject:callCenter
-                            waitUntilDone:YES];
-        };    
-    }
-}
+

 /* MODIFICATION: Add default settings */
 - (void) loadDefaultSettings {
@ -193,6 +165,13 @@
    
    [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound|UIRemoteNotificationTypeBadge];
    
+	//work around until we can access lpconfig without linphonecore
+	NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+                                 @"YES", @"start_at_boot_preference",
+								 @"YES", @"backgroundmode_preference",
+                                 nil];
+	[[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
+	
    if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
 		&& [UIApplication sharedApplication].applicationState ==  UIApplicationStateBackground
        && (![[NSUserDefaults standardUserDefaults] boolForKey:@"start_at_boot_preference"] ||
@ -202,7 +181,10 @@
        }
    
    [self startApplication];
-    
+	NSDictionary *remoteNotif =[launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+    if (remoteNotif){
+		[LinphoneLogger log:LinphoneLoggerLog format:@"PushNotification from launch received."];
+	}
    return YES;
 }

@ -212,7 +194,7 @@
        [[LinphoneManager instance]	startLibLinphone];
    }
    if([LinphoneManager isLcReady]) {
-        [self setupGSMInteraction];
+        
        
        // Only execute one time at application start
        if(!started) {
@ -228,6 +210,7 @@


 - (void)applicationWillTerminate:(UIApplication *)application {
+	
 }

 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
@ -247,41 +230,12 @@
 }

 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-    [LinphoneLogger log:LinphoneLoggerDebug format:@"PushNotification: Receive %@", userInfo];
-    /* MODIFICATION: Remove remote notification
-    NSDictionary *aps = [userInfo objectForKey:@"aps"];
-    if(aps != nil) {
-        NSDictionary *alert = [aps objectForKey:@"alert"];
-        if(alert != nil) {
-            NSString *loc_key = [alert objectForKey:@"loc-key"];
-			//if we receive a remote notification, it is because our TCP background socket was no more working.
-            //As a result, break it and refresh registers in order to make sure to receive incoming INVITE or MESSAGE
-			LinphoneCore *lc = [LinphoneManager getLc];
-			linphone_core_set_network_reachable(lc, FALSE);
-			linphone_core_set_network_reachable(lc, TRUE);
-            if(loc_key != nil) {
-                if([loc_key isEqualToString:@"IM_MSG"]) {
-                    [[PhoneMainView instance] addInhibitedEvent:kLinphoneTextReceived];
-                    [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]];
-                } else if([loc_key isEqualToString:@"IC_MSG"]) {
-                    //it's a call
-                    [[LinphoneManager instance] didReceiveRemoteNotification];
-                }
-            }
-        }
-    }
-    */
+	[LinphoneLogger log:LinphoneLoggerLog format:@"PushNotification: Receive %@", userInfo];
 }

 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
-    if([notification.userInfo objectForKey:@"call"] != nil) {
-        LinphoneCall* call;
-        [(NSData*)[notification.userInfo objectForKey:@"call"] getBytes:&call];
-        if (!call) {
-            [LinphoneLogger logc:LinphoneLoggerWarning format:"Local notification received with nil call"];
-            return;
-        }
-        linphone_core_accept_call([LinphoneManager getLc], call);
+    if([notification.userInfo objectForKey:@"callId"] != nil) {
+        [[LinphoneManager instance] acceptCallForCallId:[notification.userInfo objectForKey:@"callId"]];
    } else if([notification.userInfo objectForKey:@"chat"] != nil) {
        /* MODIFICATION: Remove chat local notificaiton
        NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"chat"];
--- a/Classes/LinphoneManager.h
+++ b/Classes/LinphoneManager.h
@ -22,6 +22,7 @@
 #import <SystemConfiguration/SCNetworkReachability.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import <AssetsLibrary/ALAssetsLibrary.h>
+#import <CoreTelephony/CTCallCenter.h>

 #import <sqlite3.h>

@ -69,10 +70,14 @@ struct NetworkReachabilityContext {
    void (*networkStateChanged) (Connectivity newConnectivity);
 };

-typedef struct _LinphoneCallAppData {
-    bool_t batteryWarningShown;
+@interface LinphoneCallAppData :NSObject {
+    @public
+	bool_t batteryWarningShown;
    UILocalNotification *notification;
-} LinphoneCallAppData;
+    NSMutableDictionary *userInfos;
+	bool_t videoRequested; /*set when user has requested for video*/
+};
+@end

 typedef struct _LinphoneManagerSounds {
    SystemSoundID call;
@ -88,9 +93,12 @@ typedef struct _LinphoneManagerSounds {
    
@private
 	NSTimer* mIterateTimer;
-    time_t lastRemoteNotificationTime;
+    NSMutableArray*  pendindCallIdFromRemoteNotif;
 	Connectivity connectivity;
    BOOL stopWaitingRegisters;
+	UIBackgroundTaskIdentifier pausedCallBgTask;
+	UIBackgroundTaskIdentifier incallBgTask;
+	CTCallCenter* callCenter;
    
    /* MODIFICATION: Add NSUSerdefault settings */
    NSDictionary *currentSettings;
@ -116,9 +124,10 @@ typedef struct _LinphoneManagerSounds {
 - (BOOL)resignActive;
 - (void)becomeActive;
 - (BOOL)enterBackgroundMode;
- (void)didReceiveRemoteNotification;
+- (void)enableAutoAnswerForCallId:(NSString*) callid;
 - (void)addPushTokenToProxyConfig: (LinphoneProxyConfig*)cfg;
- (BOOL)shouldAutoAcceptCall;
+- (BOOL)shouldAutoAcceptCallForCallId:(NSString*) callId;
+- (void)acceptCallForCallId:(NSString*)callid;
 - (void)waitForRegisterToArrive;

 + (void)kickOffNetworkConnection;
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@ -45,7 +45,7 @@ static LinphoneManager* theLinphoneManager = nil;

 const char *const LINPHONERC_APPLICATION_KEY = "app";

-NSString *const kLinphoneCoreUpdate = @"kLinphoneCoreUpdate";
+NSString *const kLinphoneCoreUpdate = @"LinphoneCoreUpdate";
 NSString *const kLinphoneDisplayStatusUpdate = @"LinphoneDisplayStatusUpdate";
 NSString *const kLinphoneTextReceived = @"LinphoneTextReceived";
 NSString *const kLinphoneCallUpdate = @"LinphoneCallUpdate";
@ -81,7 +81,22 @@ extern void libmssilk_init();
 #if HAVE_G729
 extern  void libmsbcg729_init();
 #endif
+@implementation LinphoneCallAppData
+- (id)init {
+    if ((self = [super init])) {
+		self->batteryWarningShown = FALSE;
+        self->notification = nil;
+		self->videoRequested=FALSE;
+        self->userInfos = [[NSMutableDictionary alloc] init];
+	}
+	return self;
+}

+- (void)dealloc {
+	[self->userInfos release];
+	[super dealloc];
+}
+@end
@implementation LinphoneManager

@synthesize connectivity;
@ -110,7 +125,8 @@ struct codec_name_pref_table codec_pref_table[]={
 	{ "speex", 16000, @"speex_16k_preference" },
 	{ "silk", 24000, @"silk_24k_preference" },
 	{ "silk", 16000, @"silk_16k_preference" },
-	{ "amr", 8000, @"amr_8k_preference" },
+	{ "amr", 8000, @"amr_preference" },
+    { "gsm", 8000, @"gsm_preference" },
 	{ "ilbc", 8000, @"ilbc_preference"},
 	{ "pcmu", 8000, @"pcmu_preference"},
 	{ "pcma", 8000, @"pcma_preference"},
@ -234,7 +250,7 @@ struct codec_name_pref_table codec_pref_table[]={
        [self openDatabase];
        /**/
        [self copyDefaultSettings];
-		lastRemoteNotificationTime=0;
+        pendindCallIdFromRemoteNotif = [[NSMutableArray alloc] init ];
        /* MODIFICATION: Add buschjaeger configuration */
        configuration = [[BuschJaegerConfiguration alloc] init];
        [configuration loadFile:kLinphoneConfigurationPath];
@ -268,6 +284,7 @@ struct codec_name_pref_table codec_pref_table[]={
 		[LinphoneLogger logc:LinphoneLoggerError format:"cannot un register route change handler [%ld]", lStatus];
 	}
    
+	[pendindCallIdFromRemoteNotif release];
    [super dealloc];
 }

@ -383,44 +400,39 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
 #pragma mark - Call State Functions

 - (void)onCall:(LinphoneCall*)call StateChanged:(LinphoneCallState)state withMessage:(const char *)message {
-    // Handling wrapper
    
-	CTCallCenter* ct = [[CTCallCenter alloc] init];
-    
-    int callCount = [ct.currentCalls count];
-    if (callCount>0 && state==LinphoneCallIncomingReceived) {
-		[LinphoneLogger logc:LinphoneLoggerLog format:"Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)];
-		linphone_core_terminate_call([LinphoneManager getLc], call);
-		return;
+	// Handling wrapper
+	LinphoneCallAppData* data=nil;
+	if (!linphone_call_get_user_pointer(call)) {
+        data = [[LinphoneCallAppData alloc] init];
+        linphone_call_set_user_pointer(call, data);
+    } else {
+		data = (LinphoneCallAppData*) linphone_call_get_user_pointer(call);
 	}
-	[ct release];
 	
 	if(state == LinphoneCallReleased) {
-        if(linphone_call_get_user_pointer(call) != NULL) {
-            free (linphone_call_get_user_pointer(call));
+        if(data != NULL) {
+            [data release];
            linphone_call_set_user_pointer(call, NULL);
        }
-        return;
-    }
-    if (!linphone_call_get_user_pointer(call)) {
-        LinphoneCallAppData* data = (LinphoneCallAppData*) malloc(sizeof(LinphoneCallAppData));
-        data->batteryWarningShown = FALSE;
-        data->notification = nil;
-        linphone_call_set_user_pointer(call, data);
    }
+ 
    
    // Disable speaker when no more call
    if ((state == LinphoneCallEnd || state == LinphoneCallError)) {
        if(linphone_core_get_calls_nb([LinphoneManager getLc]) == 0)
            [self setSpeakerEnabled:FALSE];
+		if (incallBgTask) {
+			[[UIApplication sharedApplication]  endBackgroundTask:incallBgTask];
+			incallBgTask=0;
+		}
    }
    
    // Enable speaker when video
    if(state == LinphoneCallIncomingReceived ||
       state == LinphoneCallOutgoingInit ||
       state == LinphoneCallConnected ||
-       state == LinphoneCallStreamsRunning ||
-       state == LinphoneCallUpdated) {
+       state == LinphoneCallStreamsRunning) {
        if (linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
            [self setSpeakerEnabled:TRUE];
        }
@ -447,7 +459,7 @@ static void linphone_iphone_transfer_state_changed(LinphoneCore* lc, LinphoneCal

 #pragma mark - Registration State Functions

-(void) onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
+- (void)onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
    [LinphoneLogger logc:LinphoneLoggerLog format:"NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message];
 	if (state==LinphoneRegistrationOk)
 		[LinphoneManager instance]->stopWaitingRegisters=TRUE;
@ -679,10 +691,14 @@ static LinphoneCoreVTable linphonec_vtable = {
 #if HAVE_G729
 	libmsbcg729_init(); // load g729 plugin
 #endif
+	[self setupGSMInteraction];
 	/* Initialize linphone core*/
-	
-    [LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"];
-	linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
+    
+	/*to make sure we don't loose debug trace*/
+	if ([[NSUserDefaults standardUserDefaults]  boolForKey:@"debugenable_preference"]) {
+		linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
+	}
+	[LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"];
 	theLinphoneCore = linphone_core_new (&linphonec_vtable
 										 , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]
 										 , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]
@ -764,10 +780,6 @@ static LinphoneCoreVTable linphonec_vtable = {
 		linphone_core_enable_video(theLinphoneCore, FALSE, FALSE);
 	}
    
-    if ([LinphoneManager runningOnIpad])
-        ms_set_cpu_count(2);
-    else
-        ms_set_cpu_count(1);
    

    
@ -788,6 +800,14 @@ static LinphoneCoreVTable linphonec_vtable = {

 - (void)destroyLibLinphone {
 	[mIterateTimer invalidate]; 
+	// destroying eventHandler if app cannot go in background.
+	// Otherwise if a GSM call happen and Linphone is resumed,
+	// the handler will be called before LinphoneCore is built.
+	// Then handler will be restored in appDidBecomeActive cb
+	callCenter.callEventHandler = nil;
+	[callCenter release];
+	callCenter = nil;
+	
 	AVAudioSession *audioSession = [AVAudioSession sharedInstance];
 	[audioSession setDelegate:nil];

@ -808,21 +828,50 @@ static LinphoneCoreVTable linphonec_vtable = {
    }
 }

- (void)didReceiveRemoteNotification{
-    lastRemoteNotificationTime=time(NULL);
+static int comp_call_id(const LinphoneCall* call , const char *callid) {
+	return strcmp(linphone_call_get_call_log(call)->call_id, callid);
 }

- (BOOL)shouldAutoAcceptCall{
-    if (lastRemoteNotificationTime!=0){
-        if ((time(NULL)-lastRemoteNotificationTime)<15)
-            return TRUE;
-        lastRemoteNotificationTime=0;
+- (void)acceptCallForCallId:(NSString*)callid {
+    //first, make sure this callid is not already involved in a call
+	if ([LinphoneManager isLcReady]) {
+		MSList* calls = (MSList*)linphone_core_get_calls([LinphoneManager getLc]);
+        MSList* call = ms_list_find_custom(calls, (MSCompareFunc)comp_call_id, [callid UTF8String]);
+		if (call != NULL) {
+            linphone_core_accept_call(theLinphoneCore, (LinphoneCall*)call->data);
+			return;
+		};
+	}
+}
+
+- (void)enableAutoAnswerForCallId:(NSString*) callid {
+    //first, make sure this callid is not already involved in a call
+	if ([LinphoneManager isLcReady]) {
+		MSList* calls = (MSList*)linphone_core_get_calls([LinphoneManager getLc]);
+		if (ms_list_find_custom(calls, (MSCompareFunc)comp_call_id, [callid UTF8String])) {
+			[LinphoneLogger log:LinphoneLoggerWarning format:@"Call id [%@] already handled",callid];
+			return;
+		};
+	}
+	if ([pendindCallIdFromRemoteNotif count] > 10 /*max number of pending notif*/)
+		[pendindCallIdFromRemoteNotif removeObjectAtIndex:0];
+	[pendindCallIdFromRemoteNotif addObject:callid];
+	
+}
+
+- (BOOL)shouldAutoAcceptCallForCallId:(NSString*) callId {
+    for (NSString* pendingNotif in pendindCallIdFromRemoteNotif) {
+		if ([pendingNotif  compare:callId] == NSOrderedSame) {
+			[pendindCallIdFromRemoteNotif removeObject:pendingNotif];
+			return TRUE;
+		}
    }
    return FALSE;
 }

 - (BOOL)resignActive {
 	linphone_core_stop_dtmf_stream(theLinphoneCore);
+
    return YES;
 }

@ -844,20 +893,28 @@ static LinphoneCoreVTable linphonec_vtable = {
    }
 }

+static int comp_call_state_paused  (const LinphoneCall* call, const void* param) {
+	return linphone_call_get_state(call) != LinphoneCallPaused;
+}
+
 - (BOOL)enterBackgroundMode {
 	LinphoneProxyConfig* proxyCfg;
 	linphone_core_get_default_proxy(theLinphoneCore, &proxyCfg);	
 	
 	
-	if (proxyCfg && [[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"]) {
-		//For registration register
-		[self refreshRegisters];
-		//wait for registration answer
-		int i=0;
-		while (!linphone_proxy_config_is_registered(proxyCfg) && i++<40 ) {
-			linphone_core_iterate(theLinphoneCore);
-			usleep(100000);
-		}
+	if ((proxyCfg || linphone_core_get_calls_nb(theLinphoneCore) > 0) &&
+        [[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"]) {
+        
+        if(proxyCfg != NULL) {
+            //For registration register
+            [self refreshRegisters];
+            //wait for registration answer
+            int i=0;
+            while (!linphone_proxy_config_is_registered(proxyCfg) && i++<40 ) {
+                linphone_core_iterate(theLinphoneCore);
+                usleep(100000);
+            }
+        }
 		//register keepalive
 		if ([[UIApplication sharedApplication] setKeepAliveTimeout:600/*(NSTimeInterval)linphone_proxy_config_get_expires(proxyCfg)*/ 
 														   handler:^{
@ -878,10 +935,18 @@ static LinphoneCoreVTable linphonec_vtable = {
 		} else {
 			[LinphoneLogger logc:LinphoneLoggerLog format:"keepalive handler cannot be registered"];
 		}
-		LCSipTransports transportValue;
-		if (linphone_core_get_sip_transports(theLinphoneCore, &transportValue)) {
-			[LinphoneLogger logc:LinphoneLoggerError format:"cannot get current transport"];	
+		LinphoneCall* currentCall = linphone_core_get_current_call(theLinphoneCore);
+		const MSList* callList = linphone_core_get_calls(theLinphoneCore);
+		if (!currentCall //no active call
+			&& callList // at least one call in a non active state
+			&& ms_list_find_custom((MSList*)callList, (MSCompareFunc) comp_call_state_paused, NULL)) {
+			pausedCallBgTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
+				[LinphoneLogger log:LinphoneLoggerWarning format:@"Call cannot be paused any more, too late"];
+			}];
+			[LinphoneLogger log:LinphoneLoggerLog format:@"Long running task started, remaining [%fs] because at least one call is paused"
+			 ,[[UIApplication  sharedApplication] backgroundTimeRemaining]];
 		}
+		
 		return YES;
 	}
 	else {
@ -897,9 +962,27 @@ static LinphoneCoreVTable linphonec_vtable = {
        [self refreshRegisters];
    }
    /**/
-    
+    if (pausedCallBgTask) {
+		[[UIApplication sharedApplication]  endBackgroundTask:pausedCallBgTask];
+		pausedCallBgTask=0;
+	}
+    if (incallBgTask) {
+		[[UIApplication sharedApplication]  endBackgroundTask:incallBgTask];
+		incallBgTask=0;
+	}
+	
 	/*IOS specific*/
 	linphone_core_start_dtmf_stream(theLinphoneCore);
+	
+	
+	//call center is unrelialable on the long run, so we change it each time the application is resumed. To avoid zombie GSM call
+	[self setupGSMInteraction];
+	
+	//to make sure presence status is correct
+	if ([callCenter currentCalls]==nil)
+		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService);
+	
+
 }

 - (void)beginInterruption {
@ -986,8 +1069,8 @@ static void audioRouteChangeListenerCallback (
 		return;
 	}
    
-    CTCallCenter* ct = [[CTCallCenter alloc] init];
-    if ([ct.currentCalls count] > 0) {
+    
+    if ([callCenter currentCalls]!=nil) {
        [LinphoneLogger logc:LinphoneLoggerError format:"GSM call in progress, cancelling outgoing SIP call request"];
 		UIAlertView* error = [[UIAlertView alloc]	initWithTitle:NSLocalizedString(@"Cannot make call",nil)
 														message:NSLocalizedString(@"Please terminate GSM call",nil) 
@ -996,16 +1079,15 @@ static void audioRouteChangeListenerCallback (
 											  otherButtonTitles:nil];
 		[error show];
        [error release];
-        [ct release];
 		return;
    }
-    [ct release];
    
 	LinphoneProxyConfig* proxyCfg;	
 	//get default proxy
 	linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg);
 	LinphoneCallParams* lcallParams = linphone_core_create_default_call_parameters([LinphoneManager getLc]);
-
+	LinphoneCall* call=NULL;
+	
 	if ([address length] == 0) return; //just return
 	if ([address hasPrefix:@"sip:"]) {
        LinphoneAddress* linphoneAddress = linphone_address_new([address cStringUsingEncoding:[NSString defaultCStringEncoding]]);  
@ -1015,7 +1097,7 @@ static void audioRouteChangeListenerCallback (
        if(transfer) {
            linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), [address cStringUsingEncoding:[NSString defaultCStringEncoding]]);
        } else {
-            linphone_core_invite_address_with_params([LinphoneManager getLc], linphoneAddress, lcallParams);
+            call=linphone_core_invite_address_with_params([LinphoneManager getLc], linphoneAddress, lcallParams);
        }
        linphone_address_destroy(linphoneAddress);
 	} else if (proxyCfg==nil){
@ -1037,10 +1119,15 @@ static void audioRouteChangeListenerCallback (
        if(transfer) {
            linphone_core_transfer_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), normalizedUserName);
        } else {
-            linphone_core_invite_address_with_params([LinphoneManager getLc], linphoneAddress, lcallParams);
+            call=linphone_core_invite_address_with_params([LinphoneManager getLc], linphoneAddress, lcallParams);
        }
        linphone_address_destroy(linphoneAddress);
 	}
+	if (call) {
+		LinphoneCallAppData* data = [[LinphoneCallAppData alloc] init];
+        data->videoRequested = linphone_call_params_video_enabled(lcallParams); /* will be used later to notify user if video was not activated because of the linphone core*/
+		linphone_call_set_user_pointer(call, data);
+	}
 	linphone_call_params_destroy(lcallParams);
 }

@ -1474,4 +1561,34 @@ static void audioRouteChangeListenerCallback (
 	return [self lpConfigIntForKey:key forSection:section] == 1;
 }

+#pragma GSM management
+
+- (void)setupGSMInteraction {
+    
+	if (callCenter != nil)
+		[callCenter release];
+	
+    callCenter = [[CTCallCenter alloc] init];
+    callCenter.callEventHandler = ^(CTCall* call) {
+		// post on main thread
+		[self performSelectorOnMainThread:@selector(handleGSMCallInteration:)
+							   withObject:callCenter
+							waitUntilDone:YES];
+	};
+    
+}
+
+- (void)handleGSMCallInteration: (id) cCenter {
+    CTCallCenter* ct = (CTCallCenter*) cCenter;
+	/* pause current call, if any */
+	LinphoneCall* call = linphone_core_get_current_call(theLinphoneCore);
+	if ([ct currentCalls]!=nil) {
+		if (call) {[LinphoneLogger logc:LinphoneLoggerLog format:"Pausing SIP call"];
+			linphone_core_pause_call(theLinphoneCore, call);
+		}
+		//set current status to busy
+		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusBusy);
+	} else
+		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService);
+}
@end
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@ -35,8 +35,8 @@
@end


-@interface UIImage (NormalizedImage)
+@interface UIImage (ForceDecode)

- (void)forceDecompression;
+ (UIImage *)decodedImageWithImage:(UIImage *)image;

@end
--- a/Classes/LinphoneUI/UILinphone.m
+++ b/Classes/LinphoneUI/UILinphone.m
@ -93,16 +93,36 @@

@end

-@implementation UIImage (NormalizedImage)
+@implementation UIImage (ForceDecode)

- (void)forceDecompression {
-    CGImageRef imageRef = [self CGImage];
+ (UIImage *)decodedImageWithImage:(UIImage *)image
+{
+    CGImageRef imageRef = image.CGImage;
    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGContextRef context = CGBitmapContextCreate(NULL, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef), 8, CGImageGetWidth(imageRef) * 4, colorSpace,kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little);
+    CGContextRef context = CGBitmapContextCreate(NULL,
+                                                 CGImageGetWidth(imageRef),
+                                                 CGImageGetHeight(imageRef),
+                                                 8,
+                                                 // Just always return width * 4 will be enough
+                                                 CGImageGetWidth(imageRef) * 4,
+                                                 // System only supports RGB, set explicitly
+                                                 colorSpace,
+                                                 // Makes system don't need to do extra conversion when displayed.
+                                                 // NOTE: here we remove the alpha channel for performance. Most of the time, images loaded
+                                                 //       from the network are jpeg with no alpha channel. As a TODO, finding a way to detect
+                                                 //       if alpha channel is necessary would be nice.
+                                                 kCGImageAlphaNoneSkipLast | kCGBitmapByteOrder32Little);
    CGColorSpaceRelease(colorSpace);
-    if (!context) { NSLog(@"Could not create context for image decompression"); return; }
-    CGContextDrawImage(context, (CGRect){{0.0f, 0.0f}, {CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}}, imageRef);
-    CFRelease(context);
+    if (!context) return nil;
+    
+    CGRect rect = (CGRect){CGPointZero,{CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}};
+    CGContextDrawImage(context, rect, imageRef);
+    CGImageRef decompressedImageRef = CGBitmapContextCreateImage(context);
+    CGContextRelease(context);
+    
+    UIImage *decompressedImage = [[UIImage alloc] initWithCGImage:decompressedImageRef scale:image.scale orientation:image.imageOrientation];
+    CGImageRelease(decompressedImageRef);
+    return [decompressedImage autorelease];
 }

@end
--- a/Classes/LinphoneUI/UIVideoButton.m
+++ b/Classes/LinphoneUI/UIVideoButton.m
@ -66,7 +66,9 @@
    [waitView startAnimating];
    
    LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
-	if (call) { 
+	if (call) {
+		LinphoneCallAppData* callAppData = (LinphoneCallAppData*)linphone_call_get_user_pointer(call);
+		callAppData->videoRequested=TRUE; /* will be used later to notify user if video was not activated because of the linphone core*/
        LinphoneCallParams* call_params =  linphone_call_params_copy(linphone_call_get_current_params(call));
        linphone_call_params_enable_video(call_params, TRUE);
        linphone_core_update_call(lc, call, call_params);
@ -104,17 +106,20 @@
 - (bool)onUpdate {
    if([LinphoneManager isLcReady]) {
        bool val = false;
+#ifdef VIDEO_ENABLED
        if(linphone_core_video_enabled([LinphoneManager getLc])) {
            LinphoneCall* currentCall = linphone_core_get_current_call([LinphoneManager getLc]);
            if (currentCall) {
                LinphoneCallState state = linphone_call_get_state(currentCall);
                switch (state) {
-                    case LinphoneCallUpdated:
+                    case LinphoneCallUpdating:
                    {
-                        [waitView stopAnimating];
+                        [self setEnabled:FALSE];
+                        break;
                    }
                    case LinphoneCallStreamsRunning:
                    {
+                        [waitView stopAnimating];
                        [self setEnabled:TRUE];
                        if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) {
                            val = true;
@ -141,6 +146,9 @@
            [self setEnabled:FALSE];
            [waitView stopAnimating];
        }
+#else //VIDEO_ENABLED
+        [self setEnabled:FALSE];
+#endif //VIDEO_ENABLED
        return val;
    } else {
 		[LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update video button: Linphone core not ready"];
--- a/Classes/Utils/CAAnimationBlocks/CAAnimation+Blocks.h
+++ b/Classes/Utils/CAAnimationBlocks/CAAnimation+Blocks.h
@ -0,0 +1,20 @@
+//
+//  CAAnimation+Blocks.h
+//  CAAnimationBlocks
+//
+//  Created by xissburg on 7/7/11.
+//  Copyright 2011 xissburg. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <QuartzCore/QuartzCore.h>
+
+
+@interface CAAnimation (BlocksAddition)
+
+@property (nonatomic, copy) void (^completion)(BOOL finished);
+@property (nonatomic, copy) void (^start)(void);
+
+- (void)setCompletion:(void (^)(BOOL finished))completion; // Forces auto-complete of setCompletion: to add the name 'finished' in the block parameter
+
+@end
--- a/Classes/Utils/CAAnimationBlocks/CAAnimation+Blocks.m
+++ b/Classes/Utils/CAAnimationBlocks/CAAnimation+Blocks.m
@ -0,0 +1,99 @@
+//
+//  CAAnimation+Blocks.m
+//  CAAnimationBlocks
+//
+//  Created by xissburg on 7/7/11.
+//  Copyright 2011 xissburg. All rights reserved.
+//
+
+#import "CAAnimation+Blocks.h"
+
+
+@interface CAAnimationDelegate : NSObject
+
+@property (nonatomic, copy) void (^completion)(BOOL);
+@property (nonatomic, copy) void (^start)(void);
+
+- (void)animationDidStart:(CAAnimation *)anim;
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag;
+
+@end
+
+@implementation CAAnimationDelegate
+
+@synthesize completion=_completion;
+@synthesize start=_start;
+
+- (id)init
+{
+    self = [super init];
+    if (self) {
+        self.completion = nil;
+        self.start = nil;
+    }
+    return self;
+}
+
+- (void)dealloc
+{
+    self.completion = nil;
+    self.start = nil;
+    [super dealloc];
+}
+
+- (void)animationDidStart:(CAAnimation *)anim
+{
+    if (self.start != nil) {
+        self.start();
+    }
+}
+
+- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+{
+    if (self.completion != nil) {
+        self.completion(flag);
+    }
+}
+
+@end
+
+
+@implementation CAAnimation (BlocksAddition)
+
+- (void)setCompletion:(void (^)(BOOL))completion
+{
+    if ([self.delegate isKindOfClass:[CAAnimationDelegate class]]) {
+        ((CAAnimationDelegate *)self.delegate).completion = completion;
+    }
+    else {
+        CAAnimationDelegate *delegate = [[CAAnimationDelegate alloc] init];
+        delegate.completion = completion;
+        self.delegate = delegate;
+        [delegate release];
+    }
+}
+
+- (void (^)(BOOL))completion
+{
+    return [self.delegate isKindOfClass:[CAAnimationDelegate class]]? ((CAAnimationDelegate *)self.delegate).completion: nil;
+}
+
+- (void)setStart:(void (^)(void))start
+{
+    if ([self.delegate isKindOfClass:[CAAnimationDelegate class]]) {
+        ((CAAnimationDelegate *)self.delegate).start = start;
+    }
+    else {
+        CAAnimationDelegate *delegate = [[CAAnimationDelegate alloc] init];
+        delegate.start = start;
+        self.delegate = delegate;
+        [delegate release];
+    }
+}
+
+- (void (^)(void))start
+{
+    return [self.delegate isKindOfClass:[CAAnimationDelegate class]]? ((CAAnimationDelegate *)self.delegate).start: nil;
+}
+
+@end
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@ -111,8 +111,16 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
    if ((self = [super init]) != nil) {
        addressBookMap  = [[NSMutableDictionary alloc] init];
        addressBook = ABAddressBookCreate();
-        ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self);
-        [self loadData];
+		ABAddressBookRegisterExternalChangeCallback (addressBook, sync_address_book, self);
+		if (ABAddressBookGetAuthorizationStatus && ABAddressBookGetAuthorizationStatus() !=  kABAuthorizationStatusNotDetermined) {
+			ABAddressBookRequestAccessWithCompletion(addressBook, ^(bool granted, CFErrorRef error) {
+				if (granted) [self loadData];
+			});
+		} else {
+			[self loadData];
+		}
+       
+        
    }
    return self;
 }
--- a/Classes/Utils/Utils.h
+++ b/Classes/Utils/Utils.h
@ -47,6 +47,7 @@ typedef enum _LinphoneLoggerSeverity {

 }

+ (BOOL)findAndResignFirstResponder:(UIView*)view;
 + (void)adjustFontSize:(UIView*)view mult:(float)mult;
 + (void)buttonFixStates:(UIButton*)button;
 + (void)buttonFixStatesForTabs:(UIButton*)button;
--- a/Classes/Utils/Utils.m
+++ b/Classes/Utils/Utils.m
@ -63,6 +63,18 @@

@implementation LinphoneUtils

+ (BOOL)findAndResignFirstResponder:(UIView*)view {
+    if (view.isFirstResponder) {
+        [view resignFirstResponder];
+        return YES;
+    }
+    for (UIView *subView in view.subviews) {
+        if ([LinphoneUtils findAndResignFirstResponder:subView])
+            return YES;
+    }
+    return NO;
+}
+
 + (void)adjustFontSize:(UIView*)view mult:(float)mult{
    if([view isKindOfClass:[UILabel class]]) {
        UILabel *label = (UILabel*)view;
--- a/Classes/en.lproj/ImageViewController.xib
+++ b/Classes/en.lproj/ImageViewController.xib
@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1926</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIButton</string>
-			<string>IBUIImageView</string>
-			<string>IBUIScrollView</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="350805517">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">290</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="714444944">
-								<reference key="NSNextResponder" ref="350805517"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrameSize">{320, 44}</string>
-								<reference key="NSSuperview" ref="350805517"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="771824371"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">toolsbar_background.png</string>
-								</object>
-							</object>
-							<object class="IBUIButton" id="771824371">
-								<reference key="NSNextResponder" ref="350805517"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{160, 44}</string>
-								<reference key="NSSuperview" ref="350805517"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="814051133"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Back</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Back</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MCAwIDAAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleShadowColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">image_back_over.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">image_back_default.png</string>
-								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">1</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-							</object>
-						</array>
-						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="714444944"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIScrollView" id="814051133">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="170933358">
-								<reference key="NSNextResponder" ref="814051133"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{320, 416}</string>
-								<reference key="NSSuperview" ref="814051133"/>
-								<reference key="NSWindow"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<reference key="IBUIBackgroundColor" ref="986758619"/>
-								<int key="IBUIContentMode">4</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="170933358"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<float key="IBUIMinimumZoomScale">0.0</float>
-						<float key="IBUIMaximumZoomScale">10</float>
-					</object>
-				</array>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="350805517"/>
-				<reference key="IBUIBackgroundColor" ref="986758619"/>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">backButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="771824371"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">imageView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="170933358"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">scrollView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="814051133"/>
-					</object>
-					<int key="connectionID">13</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="771824371"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">10</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="350805517"/>
-							<reference ref="814051133"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="350805517"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="714444944"/>
-							<reference ref="771824371"/>
-						</array>
-						<reference key="parent" ref="191373211"/>
-						<string key="objectName">toolbar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="771824371"/>
-						<reference key="parent" ref="350805517"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="714444944"/>
-						<reference key="parent" ref="350805517"/>
-						<string key="objectName">background</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="814051133"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="170933358"/>
-						</array>
-						<reference key="parent" ref="191373211"/>
-						<string key="objectName">scrollView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="170933358"/>
-						<reference key="parent" ref="814051133"/>
-						<string key="objectName">imageView</string>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ImageViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="7.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="0.0" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">13</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ImageViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onBackClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onBackClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="imageView">UIImageView</string>
-						<string key="scrollView">UIScrollView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="imageView">
-							<string key="name">imageView</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="scrollView">
-							<string key="name">scrollView</string>
-							<string key="candidateClassName">UIScrollView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ImageViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="image_back_default.png">{320, 88}</string>
-			<string key="image_back_over.png">{320, 88}</string>
-			<string key="toolsbar_background.png">{5, 88}</string>
-		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1926</string>
-	</data>
-</archive>
--- a/Classes/en.lproj/WizardViewController~ipad.xib
+++ b/Classes/en.lproj/WizardViewController~ipad.xib
@ -1,795 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1926</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIActivityIndicatorView</string>
-			<string>IBUIButton</string>
-			<string>IBUIScrollView</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="770392660">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="1004767347">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{768, 966}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="62439358"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<int key="IBUITag">1</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIBounces">NO</bool>
-						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-					</object>
-					<object class="IBUIView" id="1057285194">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">266</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="938095663">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-								</object>
-								<int key="IBUITag">28</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-							<object class="IBUIButton" id="954353386">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">294</int>
-								<string key="NSFrameSize">{384, 77}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="237722854"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">3</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Cancel</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Cancel</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor" id="514969770">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor" id="1013845973">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="929224261">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_disabled~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_default~ipad.png</string>
-								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="119426708">
-									<int key="type">1</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="722606932">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-							</object>
-							<object class="IBUIButton" id="237722854">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">291</int>
-								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="483101671"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">4</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Start</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">54</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Start</string>
-								<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
-								<reference key="IBUINormalTitleColor" ref="1013845973"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_default~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="483101671">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">-2147483357</int>
-								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="938095663"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">5</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Back</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">54</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Back</string>
-								<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
-								<reference key="IBUINormalTitleColor" ref="1013845973"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_disabled~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_default~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="954353386"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
-						<int key="IBUITag">2</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIView" id="62439358">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">-2147483374</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIActivityIndicatorView" id="41091084">
-								<reference key="NSNextResponder" ref="62439358"/>
-								<int key="NSvFlags">301</int>
-								<string key="NSFrame">{{366, 492}, {37, 37}}</string>
-								<reference key="NSSuperview" ref="62439358"/>
-								<reference key="NSNextKeyView" ref="1057285194"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">7</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<bool key="IBUIHidesWhenStopped">NO</bool>
-								<bool key="IBUIAnimating">YES</bool>
-								<int key="IBUIStyle">0</int>
-							</object>
-						</array>
-						<string key="NSFrameSize">{768, 1024}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="41091084"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwLjUAA</bytes>
-						</object>
-						<int key="IBUITag">6</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{768, 1024}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView" ref="1004767347"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="981989056"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="298371011">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="630762107">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{1024, 711}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="1066982838"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<int key="IBUITag">1</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIBounces">NO</bool>
-						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-					</object>
-					<object class="IBUIView" id="880278922">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">266</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="91020530">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-								</object>
-								<int key="IBUITag">28</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-							<object class="IBUIButton" id="378153891">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">294</int>
-								<string key="NSFrameSize">{512, 77}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="1028981026"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">3</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Cancel</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Cancel</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor" id="800077834">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor" id="760183144">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_disabled_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="1028981026">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">291</int>
-								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="351442668"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">4</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Start</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">16</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Start</string>
-								<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
-								<reference key="IBUINormalTitleColor" ref="760183144"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="351442668">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">-2147483357</int>
-								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="91020530"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">5</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Back</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">16</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Back</string>
-								<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
-								<reference key="IBUINormalTitleColor" ref="760183144"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_disabled_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="378153891"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="981989056"/>
-						<int key="IBUITag">2</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIView" id="1066982838">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">-2147483374</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIActivityIndicatorView" id="102198390">
-								<reference key="NSNextResponder" ref="1066982838"/>
-								<int key="NSvFlags">301</int>
-								<string key="NSFrame">{{494, 364}, {37, 37}}</string>
-								<reference key="NSSuperview" ref="1066982838"/>
-								<reference key="NSNextKeyView" ref="880278922"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">7</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<bool key="IBUIHidesWhenStopped">NO</bool>
-								<bool key="IBUIAnimating">YES</bool>
-								<int key="IBUIStyle">0</int>
-							</object>
-						</array>
-						<string key="NSFrameSize">{1024, 768}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="102198390"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwLjUAA</bytes>
-						</object>
-						<int key="IBUITag">6</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{1024, 768}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView" ref="630762107"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="981989056"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="770392660"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">startButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="237722854"/>
-					</object>
-					<int key="connectionID">26</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">backButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="483101671"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1004767347"/>
-					</object>
-					<int key="connectionID">99</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">portraitView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="770392660"/>
-					</object>
-					<int key="connectionID">117</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">waitView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="62439358"/>
-					</object>
-					<int key="connectionID">131</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">landscapeView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="298371011"/>
-					</object>
-					<int key="connectionID">134</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onStartClick:</string>
-						<reference key="source" ref="237722854"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="483101671"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onCancelClick:</string>
-						<reference key="source" ref="954353386"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">24</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onCancelClick:</string>
-						<reference key="source" ref="378153891"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">128</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onStartClick:</string>
-						<reference key="source" ref="1028981026"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">126</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="351442668"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="770392660"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1057285194"/>
-							<reference ref="1004767347"/>
-							<reference ref="62439358"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Portrait View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">98</int>
-						<reference key="object" ref="1004767347"/>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">contentView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="1057285194"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="483101671"/>
-							<reference ref="237722854"/>
-							<reference ref="954353386"/>
-							<reference ref="938095663"/>
-						</array>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">tabBar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="954353386"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">cancelButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="237722854"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">startButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="483101671"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">118</int>
-						<reference key="object" ref="298371011"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="630762107"/>
-							<reference ref="880278922"/>
-							<reference ref="1066982838"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Landscape View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">119</int>
-						<reference key="object" ref="630762107"/>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">contentView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">120</int>
-						<reference key="object" ref="880278922"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="378153891"/>
-							<reference ref="1028981026"/>
-							<reference ref="351442668"/>
-							<reference ref="91020530"/>
-						</array>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">tabBar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">122</int>
-						<reference key="object" ref="378153891"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">cancelButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">123</int>
-						<reference key="object" ref="1028981026"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">startButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="351442668"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="62439358"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="41091084"/>
-						</array>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">waitView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="41091084"/>
-						<reference key="parent" ref="62439358"/>
-						<string key="objectName">activityIndicatorView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">132</int>
-						<reference key="object" ref="1066982838"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="102198390"/>
-						</array>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">waitView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">133</int>
-						<reference key="object" ref="102198390"/>
-						<reference key="parent" ref="1066982838"/>
-						<string key="objectName">activityIndicatorView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">137</int>
-						<reference key="object" ref="91020530"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">background</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="938095663"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">background</string>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">WizardViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="119.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="122.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="122.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="123.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="123.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="124.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="124.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="17.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="17.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="18.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="98.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">137</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="setup_back_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_default~ipad.png">{768, 153}</string>
-			<string key="setup_back_disabled_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_disabled~ipad.png">{768, 153}</string>
-			<string key="setup_back_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_over~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_default~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_disabled_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_disabled~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_over~ipad.png">{768, 153}</string>
-			<string key="setup_start_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_start_default~ipad.png">{768, 153}</string>
-			<string key="setup_start_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_start_over~ipad.png">{768, 153}</string>
-		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1926</string>
-	</data>
-</archive>
--- a/Classes/en.lproj/WizardViews.xib
+++ b/Classes/en.lproj/WizardViews.xib
--- a/Classes/fr.lproj/ImageViewController.xib
+++ b/Classes/fr.lproj/ImageViewController.xib
@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1926</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIButton</string>
-			<string>IBUIImageView</string>
-			<string>IBUIScrollView</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="350805517">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">290</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="714444944">
-								<reference key="NSNextResponder" ref="350805517"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrameSize">{320, 44}</string>
-								<reference key="NSSuperview" ref="350805517"/>
-								<reference key="NSNextKeyView" ref="771824371"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">toolsbar_background.png</string>
-								</object>
-							</object>
-							<object class="IBUIButton" id="771824371">
-								<reference key="NSNextResponder" ref="350805517"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{160, 44}</string>
-								<reference key="NSSuperview" ref="350805517"/>
-								<reference key="NSNextKeyView" ref="814051133"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Retour</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Retour</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MCAwIDAAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleShadowColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">image_back_over.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">image_back_default.png</string>
-								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">1</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-							</object>
-						</array>
-						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSNextKeyView" ref="714444944"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIScrollView" id="814051133">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="170933358">
-								<reference key="NSNextResponder" ref="814051133"/>
-								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{320, 416}</string>
-								<reference key="NSSuperview" ref="814051133"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<reference key="IBUIBackgroundColor" ref="986758619"/>
-								<int key="IBUIContentMode">4</int>
-								<bool key="IBUIUserInteractionEnabled">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSNextKeyView" ref="170933358"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MAA</bytes>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<float key="IBUIMinimumZoomScale">0.0</float>
-						<float key="IBUIMaximumZoomScale">10</float>
-					</object>
-				</array>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView" ref="350805517"/>
-				<reference key="IBUIBackgroundColor" ref="986758619"/>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">backButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="771824371"/>
-					</object>
-					<int key="connectionID">8</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">imageView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="170933358"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">scrollView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="814051133"/>
-					</object>
-					<int key="connectionID">13</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="771824371"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">10</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="350805517"/>
-							<reference ref="814051133"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="350805517"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="714444944"/>
-							<reference ref="771824371"/>
-						</array>
-						<reference key="parent" ref="191373211"/>
-						<string key="objectName">toolbar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="771824371"/>
-						<reference key="parent" ref="350805517"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="714444944"/>
-						<reference key="parent" ref="350805517"/>
-						<string key="objectName">background</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="814051133"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="170933358"/>
-						</array>
-						<reference key="parent" ref="191373211"/>
-						<string key="objectName">scrollView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="170933358"/>
-						<reference key="parent" ref="814051133"/>
-						<string key="objectName">imageView</string>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ImageViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="7.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="0.0" key="7.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">13</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="image_back_default.png">{320, 88}</string>
-			<string key="image_back_over.png">{320, 88}</string>
-			<string key="toolsbar_background.png">{5, 88}</string>
-		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1926</string>
-	</data>
-</archive>
--- a/Classes/fr.lproj/WizardViewController~ipad.xib
+++ b/Classes/fr.lproj/WizardViewController~ipad.xib
@ -1,793 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUIButton</string>
-			<string>IBUIActivityIndicatorView</string>
-			<string>IBUIView</string>
-			<string>IBUIScrollView</string>
-			<string>IBProxyObject</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="770392660">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="1004767347">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{768, 966}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="62439358"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<int key="IBUITag">1</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIBounces">NO</bool>
-						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-					</object>
-					<object class="IBUIView" id="1057285194">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">266</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="938095663">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-								</object>
-								<int key="IBUITag">28</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-							<object class="IBUIButton" id="954353386">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">294</int>
-								<string key="NSFrameSize">{384, 77}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="237722854"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">3</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Annuler</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Annuler</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor" id="514969770">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor" id="1013845973">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="929224261">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_disabled~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_default~ipad.png</string>
-								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="119426708">
-									<int key="type">1</int>
-									<double key="pointSize">14</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="722606932">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">14</double>
-									<int key="NSfFlags">16</int>
-								</object>
-							</object>
-							<object class="IBUIButton" id="237722854">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">291</int>
-								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="483101671"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">4</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Démarrer</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">54</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Démarrer</string>
-								<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
-								<reference key="IBUINormalTitleColor" ref="1013845973"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_default~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="483101671">
-								<reference key="NSNextResponder" ref="1057285194"/>
-								<int key="NSvFlags">-2147483357</int>
-								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
-								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView" ref="938095663"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">5</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Retour</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">54</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Retour</string>
-								<reference key="IBUIHighlightedTitleColor" ref="514969770"/>
-								<reference key="IBUINormalTitleColor" ref="1013845973"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_over~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_disabled~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_default~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="954353386"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
-						<int key="IBUITag">2</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIView" id="62439358">
-						<reference key="NSNextResponder" ref="770392660"/>
-						<int key="NSvFlags">-2147483374</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIActivityIndicatorView" id="41091084">
-								<reference key="NSNextResponder" ref="62439358"/>
-								<int key="NSvFlags">301</int>
-								<string key="NSFrame">{{366, 492}, {37, 37}}</string>
-								<reference key="NSSuperview" ref="62439358"/>
-								<reference key="NSNextKeyView" ref="1057285194"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">7</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<bool key="IBUIHidesWhenStopped">NO</bool>
-								<bool key="IBUIAnimating">YES</bool>
-								<int key="IBUIStyle">0</int>
-							</object>
-						</array>
-						<string key="NSFrameSize">{768, 1024}</string>
-						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSNextKeyView" ref="41091084"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwLjUAA</bytes>
-						</object>
-						<int key="IBUITag">6</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{768, 1024}</string>
-				<reference key="NSNextKeyView" ref="1004767347"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="981989056"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="298371011">
-				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIScrollView" id="630762107">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{1024, 711}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="1066982838"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<int key="IBUITag">1</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIBounces">NO</bool>
-						<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
-					</object>
-					<object class="IBUIView" id="880278922">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">266</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="91020530">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">290</int>
-								<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-								</object>
-								<int key="IBUITag">28</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
-							<object class="IBUIButton" id="378153891">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">294</int>
-								<string key="NSFrameSize">{512, 77}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="1028981026"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">3</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Annuler</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">0.0</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Annuler</string>
-								<object class="NSColor" key="IBUIHighlightedTitleColor" id="800077834">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC43MjU0OTAxOTYxIDAuNzY4NjI3NDUxIDAuNzk2MDc4NDMxNAA</bytes>
-								</object>
-								<object class="NSColor" key="IBUINormalTitleColor" id="760183144">
-									<int key="NSColorSpace">2</int>
-									<bytes key="NSRGB">MC4zNTY4NjI3NDUxIDAuMzk2MDc4NDMxNCAwLjQzNTI5NDExNzYAA</bytes>
-								</object>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_disabled_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_cancel_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="1028981026">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">291</int>
-								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="351442668"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">4</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Démarrer</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">16</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Démarrer</string>
-								<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
-								<reference key="IBUINormalTitleColor" ref="760183144"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_start_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-							<object class="IBUIButton" id="351442668">
-								<reference key="NSNextResponder" ref="880278922"/>
-								<int key="NSvFlags">-2147483357</int>
-								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
-								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSNextKeyView" ref="91020530"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">5</int>
-								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-									<string key="IBUIAccessibilityLabel">Retour</string>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-								<double key="IBUITitleEdgeInsets.top">18</double>
-								<double key="IBUITitleEdgeInsets.bottom">0.0</double>
-								<double key="IBUITitleEdgeInsets.left">16</double>
-								<double key="IBUITitleEdgeInsets.right">0.0</double>
-								<string key="IBUINormalTitle">Retour</string>
-								<reference key="IBUIHighlightedTitleColor" ref="800077834"/>
-								<reference key="IBUINormalTitleColor" ref="760183144"/>
-								<reference key="IBUINormalTitleShadowColor" ref="929224261"/>
-								<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_over_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUIDisabledBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_disabled_landscape~ipad.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">setup_back_default_landscape~ipad.png</string>
-								</object>
-								<reference key="IBUIFontDescription" ref="119426708"/>
-								<reference key="IBUIFont" ref="722606932"/>
-							</object>
-						</array>
-						<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="378153891"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<reference key="IBUIBackgroundColor" ref="981989056"/>
-						<int key="IBUITag">2</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<object class="IBUIView" id="1066982838">
-						<reference key="NSNextResponder" ref="298371011"/>
-						<int key="NSvFlags">-2147483374</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIActivityIndicatorView" id="102198390">
-								<reference key="NSNextResponder" ref="1066982838"/>
-								<int key="NSvFlags">301</int>
-								<string key="NSFrame">{{494, 364}, {37, 37}}</string>
-								<reference key="NSSuperview" ref="1066982838"/>
-								<reference key="NSNextKeyView" ref="880278922"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<int key="IBUITag">7</int>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<bool key="IBUIHidesWhenStopped">NO</bool>
-								<bool key="IBUIAnimating">YES</bool>
-								<int key="IBUIStyle">0</int>
-							</object>
-						</array>
-						<string key="NSFrameSize">{1024, 768}</string>
-						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSNextKeyView" ref="102198390"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwLjUAA</bytes>
-						</object>
-						<int key="IBUITag">6</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-				</array>
-				<string key="NSFrameSize">{1024, 768}</string>
-				<reference key="NSNextKeyView" ref="630762107"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<reference key="IBUIBackgroundColor" ref="981989056"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="770392660"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">startButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="237722854"/>
-					</object>
-					<int key="connectionID">26</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">backButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="483101671"/>
-					</object>
-					<int key="connectionID">27</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1004767347"/>
-					</object>
-					<int key="connectionID">99</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">portraitView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="770392660"/>
-					</object>
-					<int key="connectionID">117</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">waitView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="62439358"/>
-					</object>
-					<int key="connectionID">131</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">landscapeView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="298371011"/>
-					</object>
-					<int key="connectionID">134</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onStartClick:</string>
-						<reference key="source" ref="237722854"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">25</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="483101671"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onCancelClick:</string>
-						<reference key="source" ref="954353386"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">24</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onCancelClick:</string>
-						<reference key="source" ref="378153891"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">128</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onStartClick:</string>
-						<reference key="source" ref="1028981026"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">126</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">onBackClick:</string>
-						<reference key="source" ref="351442668"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="770392660"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1057285194"/>
-							<reference ref="1004767347"/>
-							<reference ref="62439358"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Portrait View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">98</int>
-						<reference key="object" ref="1004767347"/>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">contentView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="1057285194"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="483101671"/>
-							<reference ref="237722854"/>
-							<reference ref="954353386"/>
-							<reference ref="938095663"/>
-						</array>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">tabBar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="954353386"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">cancelButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="237722854"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">startButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="483101671"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">118</int>
-						<reference key="object" ref="298371011"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="630762107"/>
-							<reference ref="880278922"/>
-							<reference ref="1066982838"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Landscape View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">119</int>
-						<reference key="object" ref="630762107"/>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">contentView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">120</int>
-						<reference key="object" ref="880278922"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="378153891"/>
-							<reference ref="1028981026"/>
-							<reference ref="351442668"/>
-							<reference ref="91020530"/>
-						</array>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">tabBar</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">122</int>
-						<reference key="object" ref="378153891"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">cancelButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">123</int>
-						<reference key="object" ref="1028981026"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">startButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="351442668"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">backButton</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="62439358"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="41091084"/>
-						</array>
-						<reference key="parent" ref="770392660"/>
-						<string key="objectName">waitView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="41091084"/>
-						<reference key="parent" ref="62439358"/>
-						<string key="objectName">activityIndicatorView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">132</int>
-						<reference key="object" ref="1066982838"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="102198390"/>
-						</array>
-						<reference key="parent" ref="298371011"/>
-						<string key="objectName">waitView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">133</int>
-						<reference key="object" ref="102198390"/>
-						<reference key="parent" ref="1066982838"/>
-						<string key="objectName">activityIndicatorView</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">137</int>
-						<reference key="object" ref="91020530"/>
-						<reference key="parent" ref="880278922"/>
-						<string key="objectName">background</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="938095663"/>
-						<reference key="parent" ref="1057285194"/>
-						<string key="objectName">background</string>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">WizardViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="119.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="122.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="122.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="123.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="123.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="124.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="124.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="16.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="16.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="17.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="17.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="18.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="2" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="98.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">137</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="setup_back_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_default~ipad.png">{768, 153}</string>
-			<string key="setup_back_disabled_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_disabled~ipad.png">{768, 153}</string>
-			<string key="setup_back_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_back_over~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_default~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_disabled_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_disabled~ipad.png">{768, 153}</string>
-			<string key="setup_cancel_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_cancel_over~ipad.png">{768, 153}</string>
-			<string key="setup_start_default_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_start_default~ipad.png">{768, 153}</string>
-			<string key="setup_start_over_landscape~ipad.png">{1024, 171}</string>
-			<string key="setup_start_over~ipad.png">{768, 153}</string>
-		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
-	</data>
-</archive>
--- a/Classes/fr.lproj/WizardViews.xib
+++ b/Classes/fr.lproj/WizardViews.xib
--- a/Settings.bundle/audio.plist
+++ b/Settings.bundle/audio.plist
@ -50,6 +50,16 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>amr_preference</string>
+			<key>Title</key>
+			<string>AMR</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>DefaultValue</key>
 			<false/>
@ -64,7 +74,17 @@
 			<key>DefaultValue</key>
 			<false/>
 			<key>Key</key>
-			<string>gsm_8k_preference</string>
+			<string>g729_preference</string>
+			<key>Title</key>
+			<string>G729</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>gsm_preference</string>
 			<key>Title</key>
 			<string>GSM</string>
 			<key>Type</key>
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@ -257,6 +257,8 @@
 		D37CD3A215E2452C0028869A /* BuschJaegerStationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D37CD3A015E2452B0028869A /* BuschJaegerStationTableViewController.m */; };
 		D37DC7181594AF3400B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; };
 		D37DC7191594AF3F00B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; };
+		D37E3ECD1619C27A0087659A /* CAAnimation+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */; };
+		D37E3ECE1619C27A0087659A /* CAAnimation+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */; };
 		D380800515C28A7A005BE9BC /* UILinphone.m in Sources */ = {isa = PBXBuildFile; fileRef = D380800415C28A7A005BE9BC /* UILinphone.m */; };
 		D380800615C28A7A005BE9BC /* UILinphone.m in Sources */ = {isa = PBXBuildFile; fileRef = D380800415C28A7A005BE9BC /* UILinphone.m */; };
 		D380801315C299D0005BE9BC /* ColorSpaceUtilites.m in Sources */ = {isa = PBXBuildFile; fileRef = D380801215C299D0005BE9BC /* ColorSpaceUtilites.m */; };
@ -693,6 +695,8 @@
 		D37CD39F15E245290028869A /* BuschJaegerStationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerStationTableViewController.h; sourceTree = "<group>"; };
 		D37CD3A015E2452B0028869A /* BuschJaegerStationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerStationTableViewController.m; sourceTree = "<group>"; };
 		D37DC7171594AF3400B2A5EB /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
+		D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CAAnimation+Blocks.h"; sourceTree = "<group>"; };
+		D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CAAnimation+Blocks.m"; sourceTree = "<group>"; };
 		D37EE160160377D7003608A6 /* DTActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTActionSheet.h; sourceTree = "<group>"; };
 		D37EE161160377D7003608A6 /* DTActionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTActionSheet.m; sourceTree = "<group>"; };
 		D380800415C28A7A005BE9BC /* UILinphone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILinphone.m; sourceTree = "<group>"; };
@ -1343,6 +1347,7 @@
 		D326483415887D4400930C67 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				D37E3ECA1619C27A0087659A /* CAAnimationBlocks */,
 				D380801215C299D0005BE9BC /* ColorSpaceUtilites.m */,
 				D380801115C29984005BE9BC /* ColorSpaceUtilities.h */,
 				D37EE15F160377D7003608A6 /* DTFoundation */,
@ -1389,6 +1394,16 @@
 			path = Utils/ZBarSDK;
 			sourceTree = "<group>";
 		};
+		D37E3ECA1619C27A0087659A /* CAAnimationBlocks */ = {
+			isa = PBXGroup;
+			children = (
+				D37E3ECB1619C27A0087659A /* CAAnimation+Blocks.h */,
+				D37E3ECC1619C27A0087659A /* CAAnimation+Blocks.m */,
+			);
+			name = CAAnimationBlocks;
+			path = Utils/CAAnimationBlocks;
+			sourceTree = "<group>";
+		};
 		D37CD35615E22B0C0028869A /* Headers */ = {
 			isa = PBXGroup;
 			children = (
@ -1744,6 +1759,7 @@
 				D376EAF416008DF1007C8226 /* User.m in Sources */,
 				D32EDD9B1600C450009A84C7 /* LevelPushButton.m in Sources */,
 				D37490841612E3F200A62D02 /* NSURLConnection+SynchronousDelegate.m in Sources */,
+				D37E3ECD1619C27A0087659A /* CAAnimation+Blocks.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -1799,6 +1815,7 @@
 				D376EAF516008DF1007C8226 /* User.m in Sources */,
 				D32EDD9C1600C450009A84C7 /* LevelPushButton.m in Sources */,
 				D37490851612E3F200A62D02 /* NSURLConnection+SynchronousDelegate.m in Sources */,
+				D37E3ECE1619C27A0087659A /* CAAnimation+Blocks.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -1833,6 +1850,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 					DEBUG,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@ -1903,6 +1921,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
@ -2147,6 +2166,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
@ -2217,6 +2237,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
--- a/submodules/build/builders.d/openssl.mk
+++ b/submodules/build/builders.d/openssl.mk
@ -1,4 +1,4 @@
-openssl_version=1.0.0a
+openssl_version=1.0.1c
 openssl_site=http://www.openssl.org/source
 OPENSSL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/openssl

--- a/submodules/externals/exosip
+++ b/submodules/externals/exosip
@ -1 +1 @@
-Subproject commit 3403f378bab82b67d569b029f466a2f1dee499bb
+Subproject commit cbb76acfe36aaa0e79911569e218d77c622fa9d4
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@ -647,8 +647,6 @@
 		22405EE31600671D00B92522 /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = logging.c; sourceTree = "<group>"; };
 		22405EE41600671D00B92522 /* rtpprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtpprofile.c; sourceTree = "<group>"; };
 		22405EE71600675C00B92522 /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = "<group>"; };
-		224AD571143208BB00510FF3 /* android-display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "android-display.c"; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/android-display.c"; sourceTree = "<group>"; };
-		224AD57314320EB400510FF3 /* scaler_arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = scaler_arm.S; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/scaler_arm.S"; sourceTree = "<group>"; };
 		22512698145F13CE0041FBF2 /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = "<group>"; };
 		2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; };
 		2258C44013A9377B0087A596 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = "<group>"; };
@ -925,73 +923,51 @@
 		222CA5DC11F6CF7600621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				22405EE71600675C00B92522 /* genericplc.c */,
-				22405EDF1600668800B92522 /* msvoip.c */,
-				221DCB6A153584410025E54D /* yuv2rgb.fs */,
-				221DCB6B153584410025E54D /* yuv2rgb.vs */,
-				221DCB6715347EF80025E54D /* opengles_display.c */,
-				2211DB9B1476539600DEE054 /* l16.c */,
-				22512698145F13CE0041FBF2 /* aqsnd.c */,
-				F4D9F25E14583B580035B0D0 /* bitratedriver.c */,
-				F4D9F25F14583B580035B0D0 /* qosanalyzer.c */,
-				22313679143DED490035C1F4 /* msandroidvideo.cpp */,
-				229ECDEE143AEC2400D611B8 /* audioconference.c */,
-				229ECDEA143AEA6300D611B8 /* msvideo_neon.c */,
-				224AD57314320EB400510FF3 /* scaler_arm.S */,
-				224AD571143208BB00510FF3 /* android-display.c */,
-				7014533713FA7AEA00A01D86 /* shaders.c */,
-				7066FC0613E82A3600EFC6DC /* vp8.c */,
-				70E542F613E14816002BA2C0 /* shaders.h */,
-				229A614913DDFE3500090183 /* g722_decode.c */,
-				229A614A13DDFE3500090183 /* g722_encode.c */,
-				229A614B13DDFE3500090183 /* g722.h */,
-				229A614C13DDFE3500090183 /* msg722.c */,
-				22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */,
-				22FC56A713CB69FA002FD0F1 /* qualityindicator.c */,
-				221F58AD13ABA42800D603C9 /* scaler.c */,
-				221F58AB13AB71A400D603C9 /* sizeconv.c */,
-				221F58A513AB716300D603C9 /* tonedetector.c */,
-				221F58A613AB716300D603C9 /* jpegwriter.c */,
-				221F58A713AB716300D603C9 /* h264dec.c */,
-				221F58A113AB6F8000D603C9 /* pixconv.c */,
-				221F589B13AB4FC500D603C9 /* msvideo.c */,
-				2258C44813A946890087A596 /* videostream.c */,
-				2258C44913A946890087A596 /* videoenc.c */,
-				2258C44A13A946890087A596 /* videodec.c */,
-				2258C44013A9377B0087A596 /* swscale.h */,
-				220ED1AA13A9062500AC21E0 /* nowebcam.h */,
-				220ED1AB13A9062500AC21E0 /* nowebcam.c */,
-				22D15AB5139F579D00C7713A /* qtcapture.m */,
-				22D15AB3139F505400C7713A /* ioscapture.m */,
-				2252935A12F6CA4700DD9BFB /* ec-calibrator.c */,
 				222CA5DD11F6CF7600621220 /* .gitignore */,
 				222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */,
 				222CA5DF11F6CF7600621220 /* alaw.c */,
+				22512698145F13CE0041FBF2 /* aqsnd.c */,
+				229ECDEE143AEC2400D611B8 /* audioconference.c */,
 				222CA5E311F6CF7600621220 /* audiomixer.c */,
 				222CA5E411F6CF7600621220 /* audiostream.c */,
+				22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */,
+				F4D9F25E14583B580035B0D0 /* bitratedriver.c */,
 				222CA5E511F6CF7600621220 /* chanadapt.c */,
 				222CA5E711F6CF7600621220 /* dsptools.c */,
 				222CA5E811F6CF7600621220 /* dtmfgen.c */,
+				2252935A12F6CA4700DD9BFB /* ec-calibrator.c */,
 				222CA5EB11F6CF7600621220 /* equalizer.c */,
 				222CA5EC11F6CF7600621220 /* eventqueue.c */,
 				222CA5ED11F6CF7600621220 /* extdisplay.c */,
 				222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */,
+				2203127413A249F70049A2ED /* filter-template.c */,
 				222CA5EF11F6CF7600621220 /* g711common.h */,
+				229A614B13DDFE3500090183 /* g722.h */,
+				229A614913DDFE3500090183 /* g722_decode.c */,
+				229A614A13DDFE3500090183 /* g722_encode.c */,
+				22405EE71600675C00B92522 /* genericplc.c */,
 				222CA5F011F6CF7600621220 /* gsm.c */,
+				221F58A713AB716300D603C9 /* h264dec.c */,
 				222CA5F211F6CF7600621220 /* ice.c */,
+				22D15AB3139F505400C7713A /* ioscapture.m */,
+				2203127113A247B40049A2ED /* iosdisplay.m */,
 				222CA5F311F6CF7600621220 /* itc.c */,
+				221F58A613AB716300D603C9 /* jpegwriter.c */,
 				222CA5F411F6CF7600621220 /* kiss_fft.c */,
 				222CA5F511F6CF7600621220 /* kiss_fft.h */,
 				222CA5F611F6CF7600621220 /* kiss_fftr.c */,
 				222CA5F711F6CF7600621220 /* kiss_fftr.h */,
+				2211DB9B1476539600DEE054 /* l16.c */,
 				222CA5F911F6CF7600621220 /* Makefile.am */,
 				222CA5FA11F6CF7600621220 /* Makefile.in */,
 				222CA5FB11F6CF7600621220 /* mire.c */,
+				22313679143DED490035C1F4 /* msandroidvideo.cpp */,
 				222CA5FD11F6CF7600621220 /* mscommon.c */,
 				222CA5FE11F6CF7600621220 /* msconf.c */,
 				222CA60011F6CF7600621220 /* msfileplayer.c */,
 				222CA60211F6CF7600621220 /* msfilerec.c */,
 				222CA60411F6CF7600621220 /* msfilter.c */,
+				229A614C13DDFE3500090183 /* msg722.c */,
 				222CA60511F6CF7600621220 /* msiounit.m */,
 				222CA60611F6CF7600621220 /* msjoin.c */,
 				222CA60711F6CF7600621220 /* msqueue.c */,
@ -1000,18 +976,38 @@
 				222CA60A11F6CF7600621220 /* mssndcard.c */,
 				222CA60B11F6CF7600621220 /* msspeex.c */,
 				222CA60C11F6CF7600621220 /* msticker.c */,
+				221F589B13AB4FC500D603C9 /* msvideo.c */,
+				229ECDEA143AEA6300D611B8 /* msvideo_neon.c */,
+				22405EDF1600668800B92522 /* msvoip.c */,
 				222CA61111F6CF7600621220 /* msvolume.c */,
 				222CA61311F6CF7600621220 /* mtu.c */,
+				220ED1AB13A9062500AC21E0 /* nowebcam.c */,
+				220ED1AA13A9062500AC21E0 /* nowebcam.h */,
+				221DCB6715347EF80025E54D /* opengles_display.c */,
+				221F58A113AB6F8000D603C9 /* pixconv.c */,
+				F4D9F25F14583B580035B0D0 /* qosanalyzer.c */,
+				22D15AB5139F579D00C7713A /* qtcapture.m */,
+				22FC56A713CB69FA002FD0F1 /* qualityindicator.c */,
 				222CA61B11F6CF7600621220 /* rfc2429.h */,
 				222CA61C11F6CF7600621220 /* rfc3984.c */,
+				221F58AD13ABA42800D603C9 /* scaler.c */,
+				221F58E313AF44B300D603C9 /* scaler.h */,
+				7014533713FA7AEA00A01D86 /* shaders.c */,
+				70E542F613E14816002BA2C0 /* shaders.h */,
+				221F58AB13AB71A400D603C9 /* sizeconv.c */,
 				222CA61F11F6CF7600621220 /* speexec.c */,
+				2258C44013A9377B0087A596 /* swscale.h */,
 				222CA62111F6CF7600621220 /* tee.c */,
+				221F58A513AB716300D603C9 /* tonedetector.c */,
 				222CA62311F6CF7600621220 /* ulaw.c */,
 				222CA62411F6CF7600621220 /* vfw-missing.h */,
+				2258C44A13A946890087A596 /* videodec.c */,
+				2258C44913A946890087A596 /* videoenc.c */,
+				2258C44813A946890087A596 /* videostream.c */,
 				222CA62911F6CF7600621220 /* void.c */,
-				2203127113A247B40049A2ED /* iosdisplay.m */,
-				2203127413A249F70049A2ED /* filter-template.c */,
-				221F58E313AF44B300D603C9 /* scaler.h */,
+				7066FC0613E82A3600EFC6DC /* vp8.c */,
+				221DCB6A153584410025E54D /* yuv2rgb.fs */,
+				221DCB6B153584410025E54D /* yuv2rgb.vs */,
 			);
 			path = src;
 			sourceTree = "<group>";
@ -1802,10 +1798,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@ -1863,10 +1855,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -2003,10 +1991,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@ -2035,6 +2019,7 @@
 					HAVE_LIBAVCODEC_AVCODEC_H,
 					HAVE_LIBSWSCALE_SWSCALE_H,
 					TARGET_OS_IPHONE,
+					MS2_FILTERS,
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = NO;
@ -2065,10 +2050,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -2094,6 +2075,7 @@
 					HAVE_LIBAVCODEC_AVCODEC_H,
 					HAVE_LIBSWSCALE_SWSCALE_H,
 					TARGET_OS_IPHONE,
+					MS2_FILTERS,
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = NO;
@ -2124,10 +2106,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -2153,6 +2131,7 @@
 					HAVE_LIBAVCODEC_AVCODEC_H,
 					HAVE_LIBSWSCALE_SWSCALE_H,
 					TARGET_OS_IPHONE,
+					MS2_FILTERS,
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_UNROLL_LOOPS = NO;
@ -2183,10 +2162,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
@ -2245,10 +2220,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -2304,10 +2275,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -2404,10 +2371,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
 				DSTROOT = /tmp/liblinphone.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
--- a/submodules/linphone
+++ b/submodules/linphone
@ -1 +1 @@
-Subproject commit d2bf8846e3c40ce5b4dec886f2d0fc6d9698fc87
+Subproject commit bdaa5ae91ac1ba1e3844fceb5f611ba37ddde964