Fix Chat image loading/lag

Fix contact remove avatar Fix orientation issue Fix bug in fastaddressbook Improve call cell animation
2026-02-07 14:18:25 +00:00 · 2012-09-25 16:14:45 +02:00 · 2012-09-25 16:14:45 +02:00 · 79b6fa8862
commit 79b6fa8862
parent d1a1bd93a4
93 changed files with 6406 additions and 4467 deletions
--- a/Classes/AboutViewController.xib
+++ b/Classes/AboutViewController.xib
@ -41,8 +41,6 @@
 				<int key="NSvFlags">268</int>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="IBUIClipsSubviews">YES</bool>
 				<bool key="IBUIMultipleTouchEnabled">YES</bool>
@ -60,7 +58,6 @@
 						<int key="NSvFlags">311</int>
 						<string key="NSFrame">{{124, 20}, {72, 72}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="945733244"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@ -76,7 +73,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 100}, {280, 50}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="966549235"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -108,7 +104,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 200}, {280, 44}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="697092436"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@ -137,7 +132,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 150}, {280, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="132342957"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -166,7 +160,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 172}, {280, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="55823705"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -188,8 +181,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 300}, {280, 21}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
@ -213,7 +204,6 @@
 						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{20, 244}, {280, 36}}</string>
 						<reference key="NSSuperview" ref="775128611"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="28600489"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -234,7 +224,6 @@
 				</object>
 				<string key="NSFrameSize">{320, 341}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="97290309"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -426,83 +415,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">68</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AboutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onLinkTap:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onLinkTap:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onLinkTap:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentView</string>
-							<string>linkLabel</string>
-							<string>linkTapGestureRecognizer</string>
-							<string>linphoneCoreVersionLabel</string>
-							<string>linphoneIphoneVersionLabel</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIView</string>
-							<string>UILabel</string>
-							<string>UITapGestureRecognizer</string>
-							<string>UILabel</string>
-							<string>UILabel</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentView</string>
-							<string>linkLabel</string>
-							<string>linkTapGestureRecognizer</string>
-							<string>linphoneCoreVersionLabel</string>
-							<string>linphoneIphoneVersionLabel</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">contentView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">linkLabel</string>
-								<string key="candidateClassName">UILabel</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">linkTapGestureRecognizer</string>
-								<string key="candidateClassName">UITapGestureRecognizer</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">linphoneCoreVersionLabel</string>
-								<string key="candidateClassName">UILabel</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">linphoneIphoneVersionLabel</string>
-								<string key="candidateClassName">UILabel</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AboutViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@ -332,9 +332,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 - (void)saveAndSend:(UIImage*)image url:(NSURL*)url {
    if(url == nil) {
        [waitView setHidden:FALSE];
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
            [[LinphoneManager instance].photoLibrary writeImageToSavedPhotosAlbum:image.CGImage
-                                                                         metadata:nil
+                                                                      orientation:(ALAssetOrientation)[image imageOrientation]
                                                                  completionBlock:^(NSURL *assetURL, NSError *error){
                                                                      dispatch_async(dispatch_get_main_queue(), ^{
                                                                          [waitView setHidden:TRUE];
@ -361,12 +361,12 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
    }
 }

- (void)chooseImageQuality:(UIImage*)original_image url:(NSURL*)url {
+- (void)chooseImageQuality:(UIImage*)image url:(NSURL*)url {
    [waitView setHidden:FALSE];
    
    DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Choose the compression", nil)];
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        UIImage *image = [original_image normalizedImage];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+        //UIImage *image = [original_image normalizedImage];
        for(NSString *key in [imageQualities allKeys]) {
            NSNumber *number = [imageQualities objectForKey:key];
            NSData *data = UIImageJPEGRepresentation(image, [number floatValue]);
@ -492,7 +492,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 - (IBAction)onPictureClick:(id)event {
 	[messageField resignFirstResponder];
    
-    [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) {
+    void (^block)(UIImagePickerControllerSourceType) = ^(UIImagePickerControllerSourceType type) {
        UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription];
        ImagePickerViewController *controller;
        if([LinphoneManager runningOnIpad]) {
@ -517,7 +517,22 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
                [controller.popoverController presentPopoverFromRect:rect inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE];
            }
        }
-    }];
+    };
+    
+    DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease];
+    if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+	    [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){
+            block(UIImagePickerControllerSourceTypeCamera);
+        }];
+	}
+	if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
+	    [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){
+            block(UIImagePickerControllerSourceTypePhotoLibrary);
+        }];
+	}
+    [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)];
+    
+    [sheet showInView:[PhoneMainView instance].view];
 }

 - (IBAction)onTransferCancelClick:(id)event {
@ -607,7 +622,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
    
    ChatModel *chat = (ChatModel *)[imageSharing userInfo];
    [[LinphoneManager instance].photoLibrary writeImageToSavedPhotosAlbum:image.CGImage
-                                                                 metadata:nil
+                                                              orientation:(ALAssetOrientation)[image imageOrientation]
                                                          completionBlock:^(NSURL *assetURL, NSError *error){
                                                              if (error) {
                                                                  [LinphoneLogger log:LinphoneLoggerError format:@"Cannot save image data downloaded [%@]", [error localizedDescription]];
--- a/Classes/ImagePickerViewController.h
+++ b/Classes/ImagePickerViewController.h
@ -35,6 +35,5 @@
@property(nonatomic,copy)      NSArray                              *mediaTypes;
@property(nonatomic)           BOOL                                  allowsEditing;
@property(nonatomic, readonly) UIPopoverController *popoverController;
-+ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block;

@end
--- a/Classes/ImagePickerViewController.m
+++ b/Classes/ImagePickerViewController.m
@ -156,23 +156,6 @@ static UICompositeViewDescription *compositeDescription = nil;
    }
 }

-+ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block {
-    DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease];
-    if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-	    [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){
-            block(UIImagePickerControllerSourceTypeCamera);
-        }];
-	}
-	if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
-	    [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){
-            block(UIImagePickerControllerSourceTypePhotoLibrary);
-        }];
-	}
-    [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)];
-    
-    [sheet showInView:[PhoneMainView instance].view];
-}
-

 #pragma mark - UIImagePickerControllerDelegate Functions

--- a/Classes/InCallTableViewController.m
+++ b/Classes/InCallTableViewController.m
@ -193,6 +193,7 @@ enum TableSection {
    [[self tableView] reloadData];
 }

+
 #pragma mark - UITableViewDataSource Functions

 - (UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
--- a/Classes/LinphoneUI/UICallCell.h
+++ b/Classes/LinphoneUI/UICallCell.h
@ -22,9 +22,17 @@
 #include "linphonecore.h"
 #include "UIPauseButton.h"

+typedef enum _UICallCellOtherView {
+    UICallCellOtherView_Avatar = 0,
+    UICallCellOtherView_AudioStats,
+    UICallCellOtherView_VideoStats,
+    UICallCellOtherView_MAX
+} UICallCellOtherView;
+
@interface UICallCellData : NSObject {
    @public
    bool minimize;
+    UICallCellOtherView view;
    LinphoneCall *call;
 }   

@ -50,6 +58,33 @@
@property (nonatomic, retain) IBOutlet UIView* headerView;
@property (nonatomic, retain) IBOutlet UIView* avatarView;

+@property (nonatomic, retain) IBOutlet UIView* audioStatsView;
+
+@property (nonatomic, retain) IBOutlet UILabel* audioCodecLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioCodecHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioUploadBandwidthLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioUploadBandwidthHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioDownloadBandwidthLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioDownloadBandwidthHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioIceConnectivityLabel;
+@property (nonatomic, retain) IBOutlet UILabel* audioIceConnectivityHeaderLabel;
+
+@property (nonatomic, retain) IBOutlet UIView* videoStatsView;
+
+@property (nonatomic, retain) IBOutlet UILabel* videoCodecLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoCodecHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoUploadBandwidthLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoUploadBandwidthHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoDownloadBandwidthLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoDownloadBandwidthHeaderLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoIceConnectivityLabel;
+@property (nonatomic, retain) IBOutlet UILabel* videoIceConnectivityHeaderLabel;
+
+@property (nonatomic, retain) IBOutlet UIView* otherView;
+
+@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsLeftSwipeGestureRecognizer;
+@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsRightSwipeGestureRecognizer;
+
@property (assign) BOOL firstCell;
@property (assign) BOOL conferenceCell;
@property (nonatomic, assign) BOOL currentCall;
@ -60,7 +95,8 @@

 - (IBAction)doHeaderClick:(id)sender;
 - (IBAction)doRemoveClick:(id)sender;
-
+- (IBAction)doDetailsSwipe:(UISwipeGestureRecognizer *)sender;
+    
 + (int)getMaximizedHeight;
 + (int)getMinimizedHeight;

--- a/Classes/LinphoneUI/UICallCell.m
+++ b/Classes/LinphoneUI/UICallCell.m
@ -30,6 +30,7 @@
    self = [super init];
    if(self != nil) {
        self->minimize = false;
+        self->view = UICallCellOtherView_Avatar;
        self->call = acall;
    }
    return self;
@ -53,10 +54,35 @@
@synthesize headerView;
@synthesize avatarView;

+@synthesize audioStatsView;
+
+@synthesize audioCodecLabel;
+@synthesize audioCodecHeaderLabel;
+@synthesize audioUploadBandwidthLabel;
+@synthesize audioUploadBandwidthHeaderLabel;
+@synthesize audioDownloadBandwidthLabel;
+@synthesize audioDownloadBandwidthHeaderLabel;
+@synthesize audioIceConnectivityLabel;
+@synthesize audioIceConnectivityHeaderLabel;
+
+@synthesize videoStatsView;
+
+@synthesize videoCodecLabel;
+@synthesize videoCodecHeaderLabel;
+@synthesize videoUploadBandwidthLabel;
+@synthesize videoUploadBandwidthHeaderLabel;
+@synthesize videoDownloadBandwidthLabel;
+@synthesize videoDownloadBandwidthHeaderLabel;
+@synthesize videoIceConnectivityLabel;
+@synthesize videoIceConnectivityHeaderLabel;
+
+@synthesize otherView;
+
@synthesize firstCell;
@synthesize conferenceCell;
@synthesize currentCall;
-
+@synthesize detailsLeftSwipeGestureRecognizer;
+@synthesize detailsRightSwipeGestureRecognizer;

 #pragma mark - Lifecycle Functions

@ -74,53 +100,106 @@
                              forState:(UIControlStateHighlighted | UIControlStateSelected)];
        
        self->currentCall = FALSE;
+        
+        self->detailsRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)];
+        [detailsRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionLeft];
+        [otherView addGestureRecognizer:detailsRightSwipeGestureRecognizer];
+        
+        self->detailsRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)];
+        [detailsRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionRight];
+        [otherView addGestureRecognizer:detailsRightSwipeGestureRecognizer];
+        
+        [self->avatarView setHidden:TRUE];
+        [self->audioStatsView setHidden:TRUE];
+        [self->videoStatsView setHidden:TRUE];
+        
+        [UICallCell adaptSize:audioCodecHeaderLabel field:audioCodecLabel];
+        [UICallCell adaptSize:audioDownloadBandwidthHeaderLabel field:audioDownloadBandwidthLabel];
+        [UICallCell adaptSize:audioUploadBandwidthHeaderLabel field:audioUploadBandwidthLabel];
+        [UICallCell adaptSize:audioIceConnectivityHeaderLabel field:audioIceConnectivityLabel];
+        
+        [UICallCell adaptSize:videoCodecHeaderLabel field:videoCodecLabel];
+        [UICallCell adaptSize:videoDownloadBandwidthHeaderLabel field:videoDownloadBandwidthLabel];
+        [UICallCell adaptSize:videoUploadBandwidthHeaderLabel field:videoUploadBandwidthLabel];
+        [UICallCell adaptSize:videoIceConnectivityHeaderLabel field:videoIceConnectivityLabel];
    }
    return self;
 }

 - (void)dealloc {
    [headerBackgroundImage release];
+    [headerBackgroundHighlightImage release];
+    
    [addressLabel release];
    [stateLabel release];
    [stateImage release];
    [avatarImage release];
+    [pauseButton release];
+    [removeButton release];
+    
    [headerView release];
+    [avatarView release];
+    
+    [audioStatsView release];
+    
+    [audioCodecLabel release];
+    [audioCodecHeaderLabel release];
+    [audioUploadBandwidthLabel release];
+    [audioUploadBandwidthHeaderLabel release];
+    [audioDownloadBandwidthLabel release];
+    [audioDownloadBandwidthHeaderLabel release];
+    [audioIceConnectivityLabel release];
+    [audioIceConnectivityHeaderLabel release];
+    
+    [videoStatsView release];
+    
+    [videoCodecLabel release];
+    [videoCodecHeaderLabel release];
+    [videoUploadBandwidthLabel release];
+    [videoUploadBandwidthHeaderLabel release];
+    [videoDownloadBandwidthLabel release];
+    [videoDownloadBandwidthHeaderLabel release];
+    [videoIceConnectivityLabel release];
+    [videoIceConnectivityHeaderLabel release];
+    
+    [otherView release];
+    
    [data release];
+    
+    [detailsLeftSwipeGestureRecognizer release];
+    [detailsRightSwipeGestureRecognizer release];
+    
    [super dealloc];
 }


 - (void)prepareForReuse {
-    [super prepareForReuse];
-    currentCall = FALSE;
-    [headerBackgroundHighlightImage setAlpha:0.0f];
-    [data release];
-    data = nil;
+    
 }

-
 #pragma mark - Properties Functions

 - (void)setData:(UICallCellData *)adata {
-    if(data !=nil) {
+    if(adata == data) {
+        return;
+    }
+    if(data != nil) {
        [data release];
        data = nil;
    }
-    if(adata !=nil) {
+    if(adata != nil) {
        data = [adata retain];
+        [self updateContact];
    }
-    [self update];
 }

 - (void)setCurrentCall:(BOOL) val {
-    BOOL oldVal = currentCall;
    currentCall = val;
-    if(oldVal != val) {
-        if (currentCall) {
-            [self startBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage];
-        } else {
-            [self stopBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage];
-        }
+    if (currentCall && ![self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) {
+        [self startBlinkAnimation:@"blink" target:headerBackgroundHighlightImage];
+    }
+    if (!currentCall && [self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) {
+        [self stopBlinkAnimation:@"blink" target:headerBackgroundHighlightImage];
    }
 }

@ -135,19 +214,70 @@
    return 54;
 }

- (void)startBlinkAnimation:(NSString *)animationID  target:(UIView *)target {   
-    [UIView animateWithDuration:1.0
-                          delay: 0.0
-                        options: UIViewAnimationOptionRepeat | 
-                                 UIViewAnimationOptionAutoreverse | 
-                                 UIViewAnimationOptionAllowUserInteraction | 
-                                 UIViewAnimationOptionCurveEaseIn
-                     animations:^{
-                             [target setAlpha:1.0f];
-                     }
-                     completion:^(BOOL finished){
-                     }];
+ (void)adaptSize:(UILabel*)label field:(UIView*)field {
+    //
+    // Adapt size
+    //
+    CGRect labelFrame = [label frame];
+    CGRect fieldFrame = [field frame];
+    
+    fieldFrame.origin.x -= labelFrame.size.width;
+    
+    // Compute firstName size
+    CGSize contraints;
+    contraints.height = [label frame].size.height;
+    contraints.width = ([field frame].size.width + [field frame].origin.x) - [label frame].origin.x;
+    CGSize firstNameSize = [[label text] sizeWithFont:[label font] constrainedToSize: contraints];
+    labelFrame.size.width = firstNameSize.width;
+    
+    // Compute lastName size & position
+    fieldFrame.origin.x += labelFrame.size.width;
+    fieldFrame.size.width = (contraints.width + [label frame].origin.x) - fieldFrame.origin.x;
+    
+    [label setFrame: labelFrame];
+    [field setFrame: fieldFrame];
+}

+
+ (NSString*)iceToString:(LinphoneIceState)state {
+    switch (state) {
+        case LinphoneIceStateNotActivated:
+            return NSLocalizedString(@"Not activated", @"ICE has not been activated for this call");
+            break;
+        case LinphoneIceStateFailed:
+            return NSLocalizedString(@"Failed", @"ICE processing has failed");
+            break;
+        case LinphoneIceStateInProgress:
+            return NSLocalizedString(@"In progress", @"ICE process is in progress");
+            break;
+        case LinphoneIceStateHostConnection:
+            return NSLocalizedString(@"Direct connection", @"ICE has established a direct connection to the remote host");
+            break;
+        case LinphoneIceStateReflexiveConnection:
+            return NSLocalizedString(@"NAT(s) connection", @"ICE has established a connection to the remote host through one or several NATs");
+            break;
+        case LinphoneIceStateRelayConnection:
+            return NSLocalizedString(@"Relay connection", @"ICE has established a connection through a relay");
+            break;
+    }
+}
+
+
+#pragma mark - Animation Functions
+
+- (void)startBlinkAnimation:(NSString *)animationID  target:(UIView *)target {
+    CABasicAnimation *blink = [CABasicAnimation animationWithKeyPath:@"opacity"];
+    blink.duration = 1.0;
+    blink.fromValue = [NSNumber numberWithDouble:0.0f];
+    blink.toValue = [NSNumber numberWithDouble:1.0f];
+    blink.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
+    blink.autoreverses = TRUE;
+    blink.repeatCount = HUGE_VALF;
+    [target.layer addAnimation:blink forKey:animationID];
+}
+
+- (BOOL)isBlinkAnimationRunning:(NSString *)animationID target:(UIView *)target {
+    return [target.layer animationForKey:animationID] != nil;
 }

 - (void)stopBlinkAnimation:(NSString *)animationID target:(UIView *)target {
@ -156,9 +286,9 @@
 }

         
-#pragma mark - 
+#pragma mark -

- (void)update {
+- (void)updateContact {
    if(data == nil || data->call == NULL) {
        [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"];
        return;
@ -170,7 +300,7 @@
    NSString* address  = nil;
    if(addr != NULL) {
        BOOL useLinphoneAddress = true;
-        // contact name 
+        // contact name
        char* lAddress = linphone_address_as_string_uri_only(addr);
        if(lAddress) {
            NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:lAddress]];
@ -185,9 +315,9 @@
        if(useLinphoneAddress) {
            const char* lDisplayName = linphone_address_get_display_name(addr);
            const char* lUserName = linphone_address_get_username(addr);
-            if (lDisplayName) 
+            if (lDisplayName)
                address = [NSString stringWithUTF8String:lDisplayName];
-            else if(lUserName) 
+            else if(lUserName)
                address = [NSString stringWithUTF8String:lUserName];
        }
    }
@ -203,6 +333,14 @@
        address = @"Unknown";
    }
    [addressLabel setText:address];
+}
+
+- (void)update {
+    if(data == nil || data->call == NULL) {
+        [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"];
+        return;
+    }
+    LinphoneCall *call = data->call;
    
    LinphoneCallState state = linphone_call_get_state(call);
    if(!conferenceCell) {
@ -239,16 +377,85 @@
    
    if(!data->minimize) {
        CGRect frame = [self frame];
-        frame.size.height = [avatarView frame].size.height;
+        frame.size.height = [otherView frame].size.height;
        [self setFrame:frame];
-        [avatarView setHidden:false];
+        [otherView setHidden:false];
    } else {
        CGRect frame = [self frame];
        frame.size.height = [headerView frame].size.height;
        [self setFrame:frame];
-        [avatarView setHidden:true];
+        [otherView setHidden:true];
    }
    [pauseButton setType:UIPauseButtonType_Call call:call];
+    
+    [self updateStats];
+    
+    [self updateDetailsView];
+}
+
+- (void)updateStats {
+    if(data == nil || data->call == NULL) {
+        [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update call cell: null call or data"];
+        return;
+    }
+    LinphoneCall *call = data->call;
+    
+    const LinphoneCallParams *params = linphone_call_get_current_params(call);
+    {
+        const PayloadType* payload = linphone_call_params_get_used_audio_codec(params);
+        if(payload != NULL) {
+            [audioCodecLabel setText:[NSString stringWithFormat:@"%s/%i/%i", payload->mime_type, payload->clock_rate, payload->channels]];
+        } else {
+            [audioCodecLabel setText:NSLocalizedString(@"No codec", nil)];
+        }
+        const LinphoneCallStats *stats = linphone_call_get_audio_stats(call);
+        if(stats != NULL) {
+            [audioUploadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->upload_bandwidth]];
+            [audioDownloadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->download_bandwidth]];
+            [audioIceConnectivityLabel setText:[UICallCell iceToString:stats->ice_state]];
+        } else {
+            [audioUploadBandwidthLabel setText:@""];
+            [audioDownloadBandwidthLabel setText:@""];
+            [audioIceConnectivityLabel setText:@""];
+        }
+    }
+    
+    {
+        const PayloadType* payload = linphone_call_params_get_used_video_codec(params);
+        if(payload != NULL) {
+            [videoCodecLabel setText:[NSString stringWithFormat:@"%s/%i", payload->mime_type, payload->clock_rate]];
+        } else {
+            [videoCodecLabel setText:NSLocalizedString(@"No codec", nil)];
+        }
+        
+        const LinphoneCallStats *stats = linphone_call_get_video_stats(call);
+        if(stats != NULL) {
+            [videoUploadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->upload_bandwidth]];
+            [videoDownloadBandwidthLabel setText:[NSString stringWithFormat:@"%1.1f kbits/s", stats->download_bandwidth]];
+            [videoIceConnectivityLabel setText:[UICallCell iceToString:stats->ice_state]];
+        } else {
+            [videoUploadBandwidthLabel setText:@""];
+            [videoDownloadBandwidthLabel setText:@""];
+            [videoIceConnectivityLabel setText:@""];
+        }
+    }
+}
+
+
+- (void)updateDetailsView {
+    if(data->view == UICallCellOtherView_Avatar && avatarView.isHidden) {
+        [self->avatarView setHidden:FALSE];
+        [self->audioStatsView setHidden:TRUE];
+        [self->videoStatsView setHidden:TRUE];
+    } else if(data->view == UICallCellOtherView_AudioStats && audioStatsView.isHidden) {
+        [self->avatarView setHidden:TRUE];
+        [self->audioStatsView setHidden:FALSE];
+        [self->videoStatsView setHidden:TRUE];
+    } else if(data->view == UICallCellOtherView_VideoStats && videoStatsView.isHidden) {
+        [self->avatarView setHidden:TRUE];
+        [self->audioStatsView setHidden:TRUE];
+        [self->videoStatsView setHidden:FALSE];
+    }
 }

 - (void)selfUpdate {
@ -277,4 +484,36 @@
    }
 }

+- (IBAction)doDetailsSwipe:(UISwipeGestureRecognizer *)sender {
+    CATransition* trans = nil;
+    if (sender.direction == UISwipeGestureRecognizerDirectionLeft) {
+        if(data->view == UICallCellOtherView_MAX - 1) {
+            data->view = 0;
+        } else {
+            ++data->view;
+        }
+        trans = [CATransition animation];
+        [trans setType:kCATransitionPush];
+        [trans setDuration:0.35];
+        [trans setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
+        [trans setSubtype:kCATransitionFromRight];
+    } else if (sender.direction == UISwipeGestureRecognizerDirectionRight) {
+        if(data->view == 0) {
+            data->view = UICallCellOtherView_MAX - 1;
+        } else {
+            --data->view;
+        }
+        trans = [CATransition animation];
+        [trans setType:kCATransitionPush];
+        [trans setDuration:0.35];
+        [trans setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
+        [trans setSubtype:kCATransitionFromLeft];
+    }
+    if(trans) {
+        [otherView.layer removeAnimationForKey:@"transition"];
+        [otherView.layer addAnimation:trans forKey:@"transition"];
+        [self updateDetailsView];
+    }
+}
+
@end
--- a/Classes/LinphoneUI/UIChatCell.xib
+++ b/Classes/LinphoneUI/UIChatCell.xib
@ -42,7 +42,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{10, 8}, {27, 27}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="394118737"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -57,7 +56,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{45, 0}, {60, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="641729677"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -94,7 +92,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{110, 0}, {170, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="753878244"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -127,7 +124,6 @@
 						<int key="NSvFlags">257</int>
 						<string key="NSFrame">{{276, 0}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="186935856"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -170,7 +166,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{10, 12}, {24, 20}}</string>
 								<reference key="NSSuperview" ref="186935856"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="960259784"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -185,7 +180,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{12, 10}, {20, 20}}</string>
 								<reference key="NSSuperview" ref="186935856"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@ -217,7 +211,6 @@
 						</array>
 						<string key="NSFrame">{{276, 0}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="692798876"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="886300225">
@ -229,7 +222,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="567463562"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="886300225"/>
@ -397,69 +389,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">43</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIChatCell</string>
-					<string key="superclassName">UITableViewCell</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onDeleteClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onDeleteClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onDeleteClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="chatContentLabel">UILabel</string>
-						<string key="deleteButton">UIButton</string>
-						<string key="unreadMessageLabel">UILabel</string>
-						<string key="unreadMessageView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatContentLabel">
-							<string key="name">chatContentLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="deleteButton">
-							<string key="name">deleteButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="unreadMessageLabel">
-							<string key="name">unreadMessageLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="unreadMessageView">
-							<string key="name">unreadMessageView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIChatCell.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/UIChatRoomCell.h
+++ b/Classes/LinphoneUI/UIChatRoomCell.h
@ -21,6 +21,7 @@

 #import "ChatModel.h"
 #import "ChatRoomTableViewController.h"
+#import "UILoadingImageView.h"


@interface UIChatRoomCell : UITableViewCell {
@ -31,7 +32,7 @@
@property (nonatomic, retain) IBOutlet UIView *bubbleView;
@property (nonatomic, retain) IBOutlet UIImageView* backgroundImage;
@property (nonatomic, retain) IBOutlet UITextView *messageText;
-@property (nonatomic, retain) IBOutlet UIImageView *messageImageView;
+@property (nonatomic, retain) IBOutlet UILoadingImageView *messageImageView;
@property (nonatomic, retain) IBOutlet UIButton *deleteButton;
@property (nonatomic, retain) IBOutlet UILabel *dateLabel;
@property (nonatomic, retain) IBOutlet UIImageView* statusImage;
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@ -18,6 +18,7 @@
 */  

 #import "UIChatRoomCell.h"
+#import "UILinphone.h"
 #import "Utils.h"
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
@ -85,20 +86,27 @@ static UIFont *CELL_FONT = nil;
    [super dealloc];
 }

+- (void)prepareForReuse {
+    
+}
+

 #pragma mark - 

 - (void)setChat:(ChatModel *)achat {
+    if(chat == achat) {
+        return;
+    }
+    
    if(chat != nil) {
        [chat release];
+        chat = nil;
+    }
+    
+    if(achat != nil) {
+        chat = [achat retain];
+        [self update];
    }
-    chat = [achat retain];
-    [self update];
-}
-
- (void)prepareForReuse {
-    [super prepareForReuse];
-    chat = nil;
 }

 - (void)update {
@ -116,14 +124,22 @@ static UIFont *CELL_FONT = nil;
        [downloadButton setHidden:FALSE];
    } else if([chat isInternalImage]) {
        [messageText setHidden:TRUE];
-        
+        [messageImageView setImage:nil];
+        [messageImageView startLoading];
+        ChatModel *achat = chat;
        [[LinphoneManager instance].photoLibrary assetForURL:[NSURL URLWithString:[chat message]] resultBlock:^(ALAsset *asset) {
-            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, (unsigned long)NULL), ^(void) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, (unsigned long)NULL), ^(void) {
                ALAssetRepresentation* representation = [asset defaultRepresentation];
-                UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage]];
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [messageImageView setImage:image];
-                });
+                UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage]
+                                                     scale:representation.scale
+                                               orientation:(UIImageOrientation)representation.orientation];
+                [image forceDecompression];
+                if(achat == self->chat) { //Avoid glitch and scrolling
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [messageImageView setImage:image];
+                        [messageImageView stopLoading];
+                    });
+                }
            });
        } failureBlock:^(NSError *error) {
            [LinphoneLogger log:LinphoneLoggerError format:@"Can't read image"];
--- a/Classes/LinphoneUI/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/UIChatRoomCell.xib
@ -194,6 +194,7 @@
 								<string key="NSFrame">{{284, 104}, {10, 10}}</string>
 								<reference key="NSSuperview" ref="456806949"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -258,6 +259,7 @@
 				<string key="NSFrameSize">{100, 100}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="765717609"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -268,6 +270,7 @@
 				<string key="NSFrameSize">{100, 100}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="765717609"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -503,6 +506,7 @@
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="28.CustomClassName">UILoadingImageView</string>
 				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -600,14 +604,29 @@
 						<string key="minorKey">./Classes/UIChatRoomCell.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILoadingImageView</string>
+					<string key="superclassName">UIImageView</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitIndicatorView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitIndicatorView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitIndicatorView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILoadingImageView.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/UIContactDetailsHeader.m
+++ b/Classes/LinphoneUI/UIContactDetailsHeader.m
@ -23,6 +23,7 @@
 #import "FastAddressBook.h"
 #import "UILinphone.h"
 #import "PhoneMainView.h"
+#import "DTActionSheet.h"

 #import <MobileCoreServices/UTCoreTypes.h>

@ -246,7 +247,7 @@

 - (IBAction)onAvatarClick:(id)event {
    if(self.isEditing) {
-        [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) {
+        void (^block)(UIImagePickerControllerSourceType) = ^(UIImagePickerControllerSourceType type) {
            UICompositeViewDescription *description = [ImagePickerViewController compositeViewDescription];
            ImagePickerViewController *controller;
            if([LinphoneManager runningOnIpad]) {
@ -270,7 +271,30 @@
                    [controller.popoverController presentPopoverFromRect:[avatarImage frame] inView:self.view permittedArrowDirections:UIPopoverArrowDirectionAny animated:FALSE];
                }
            }
-        }];
+        };
+        DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease];
+        if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+            [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){
+                block(UIImagePickerControllerSourceTypeCamera);
+            }];
+        }
+        if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
+            [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){
+                block(UIImagePickerControllerSourceTypePhotoLibrary);
+            }];
+        }
+        if([FastAddressBook getContactImage:contact thumbnail:true] != nil) {
+            [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Remove", nil) block:^(){
+                NSError* error = NULL;
+                if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) {
+                    [LinphoneLogger log:LinphoneLoggerLog format:@"Can't remove entry: %@", [error localizedDescription]];
+                }
+                [self update];
+            }];
+        }
+        [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)];
+        
+        [sheet showInView:[PhoneMainView instance].view];
    }
 }

@ -290,7 +314,7 @@
    if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) {
        [LinphoneLogger log:LinphoneLoggerLog format:@"Can't remove entry: %@", [error localizedDescription]];
    }
-    NSData *dataRef = UIImagePNGRepresentation([image normalizedImage]); 
+    NSData *dataRef = UIImageJPEGRepresentation(image, 0.9f);
    CFDataRef cfdata = CFDataCreate(NULL,[dataRef bytes], [dataRef length]);
                                    
    if(!ABPersonSetImageData(contact, cfdata, (CFErrorRef*)error)) {
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@ -37,6 +37,6 @@

@interface UIImage (NormalizedImage)

- (UIImage *)normalizedImage;
+- (void)forceDecompression;

@end
--- a/Classes/LinphoneUI/UILinphone.m
+++ b/Classes/LinphoneUI/UILinphone.m
@ -95,14 +95,14 @@

@implementation UIImage (NormalizedImage)

- (UIImage *)normalizedImage {
-    if (self.imageOrientation == UIImageOrientationUp) return self;
-    
-    UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale);
-    [self drawInRect:(CGRect){0, 0, self.size}];
-    UIImage *normalizedImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return normalizedImage;
+- (void)forceDecompression {
+    CGImageRef imageRef = [self CGImage];
+    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+    CGContextRef context = CGBitmapContextCreate(NULL, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef), 8, CGImageGetWidth(imageRef) * 4, colorSpace,kCGImageAlphaPremultipliedFirst | 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);
 }

@end
--- a/Classes/LinphoneUI/UILoadingImageView.h
+++ b/Classes/LinphoneUI/UILoadingImageView.h
@ -0,0 +1,30 @@
+/* UILoadingImageView.h
+ *
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface UILoadingImageView : UIImageView
+
+
+- (void)startLoading;
+- (void)stopLoading;
+
+@property (nonatomic, readonly) IBOutlet UIActivityIndicatorView *waitIndicatorView;
+
+@end
--- a/Classes/LinphoneUI/UILoadingImageView.m
+++ b/Classes/LinphoneUI/UILoadingImageView.m
@ -0,0 +1,97 @@
+/* UILoadingImageView.h
+ *
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "UILoadingImageView.h"
+
+@implementation UILoadingImageView
+
+
+@synthesize waitIndicatorView;
+
+
+#pragma mark - Lifecycle Functions
+
+- (void)initUIRemoteImageView {
+    waitIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+    waitIndicatorView.hidesWhenStopped = TRUE;
+    waitIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin |
+                                        UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
+    waitIndicatorView.center = self.center;
+    [self addSubview:waitIndicatorView];
+}
+
+- (id)init {
+    self = [super init];
+    if(self != nil) {
+        [self initUIRemoteImageView];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if(self != nil) {
+        [self initUIRemoteImageView];
+    }
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if(self != nil) {
+        [self initUIRemoteImageView];
+    }
+    return self;
+}
+
+- (id)initWithImage:(UIImage *)image {
+    self = [super initWithImage:image];
+    if(self != nil) {
+        [self initUIRemoteImageView];
+    }
+    return self;
+}
+
+- (id)initWithImage:(UIImage *)image highlightedImage:(UIImage *)highlightedImage {
+    self = [super initWithImage:image highlightedImage:highlightedImage];
+    if(self != nil) {
+        [self initUIRemoteImageView];
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [waitIndicatorView release];
+    
+    [super dealloc];
+}
+
+
+#pragma mark -
+
+- (void)startLoading {
+    [waitIndicatorView startAnimating];
+}
+
+- (void)stopLoading {
+    [waitIndicatorView stopAnimating];
+}
+
+
+@end
--- a/Classes/LinphoneUI/UIStateBar.xib
+++ b/Classes/LinphoneUI/UIStateBar.xib
@ -413,70 +413,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">26</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIStateBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="callQualityImage">UIImageView</string>
-						<string key="callSecurityImage">UIImageView</string>
-						<string key="registrationStateImage">UIImageView</string>
-						<string key="registrationStateLabel">UILabel</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="callQualityImage">
-							<string key="name">callQualityImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callSecurityImage">
-							<string key="name">callSecurityImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="registrationStateImage">
-							<string key="name">registrationStateImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="registrationStateLabel">
-							<string key="name">registrationStateLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIStateBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib
@ -42,6 +42,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 335}, {320, 125}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -63,6 +64,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612787992"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -78,6 +80,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1062143568"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -121,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="843780954"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -148,6 +152,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070521404"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -175,6 +180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="736263510"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -202,6 +208,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="977745568"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -229,6 +236,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="308872469"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -256,6 +264,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809465959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -283,6 +292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="193555513"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -310,6 +320,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="357389737"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -337,6 +348,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="525082175"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -364,6 +376,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="951243834"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -391,6 +404,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="143533231"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -416,6 +430,7 @@
 						</array>
 						<string key="NSFrame">{{20, 57}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="291142801"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
@ -434,6 +449,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 0}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="471717543"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -489,8 +505,9 @@
 							<object class="IBUIButton" id="471717543">
 								<reference key="NSNextResponder" ref="1070539677"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{3, 61}, {77, 68}}</string>
+								<string key="NSFrame">{{3, 58}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="464536687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -528,8 +545,9 @@
 								<reference key="IBUIFont" ref="858493639"/>
 							</object>
 						</array>
-						<string key="NSFrame">{{240, 205}, {80, 129}}</string>
+						<string key="NSFrame">{{240, 208}, {80, 126}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="322088049"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -545,6 +563,7 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 135}, {320, 2000}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070539677"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -559,6 +578,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{80, 67}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1016105438"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -605,6 +625,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{20, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="693636558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -617,6 +638,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{80, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="264394465"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -663,6 +685,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{160, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62185125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -709,6 +732,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{240, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="542459126"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -755,6 +779,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351323248"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -791,6 +816,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="99607181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -820,6 +846,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{105, 67}, {111, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="976589610"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -849,6 +876,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="259467918"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -884,6 +912,7 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="262544423"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -893,6 +922,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="556199520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -908,6 +938,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 248}, {480, 72}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="408941248"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -930,6 +961,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="519560860"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -942,6 +974,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="526609754"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -964,6 +997,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="881223252"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -982,6 +1016,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="923486394"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1000,6 +1035,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="121694741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1018,6 +1054,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="30269278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1036,6 +1073,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="625010060"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1054,6 +1092,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="963396110"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1072,6 +1111,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="761686959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1090,6 +1130,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="629341434"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1108,6 +1149,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809495409"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1126,6 +1168,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="94322278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1144,6 +1187,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<int key="IBUITag">14</int>
@ -1159,6 +1203,7 @@
 						</array>
 						<string key="NSFrame">{{91, 0}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="996491821"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1174,6 +1219,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{65, 55}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="173491714"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1215,6 +1261,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 51}, {65, 55}}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="974396983"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1254,6 +1301,7 @@
 						</array>
 						<string key="NSFrame">{{415, 140}, {65, 105}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="294395401"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1269,6 +1317,7 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 82}, {480, 2000}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="557887372"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -1283,6 +1332,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{65, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="814604354"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1329,6 +1379,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{79, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528058217"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1341,6 +1392,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{130, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="839169662"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1387,6 +1439,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{285, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="893150238"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1433,6 +1486,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{350, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="889778982"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1479,6 +1533,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="104218181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1512,6 +1567,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="102684796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1541,6 +1597,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{195, 0}, {90, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="594075760"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1570,6 +1627,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="298889112"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1602,6 +1660,7 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="511619008"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1611,6 +1670,7 @@
 				</array>
 				<string key="NSFrameSize">{480, 320}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="950460796"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -2607,13 +2667,289 @@
 			<nil key="sourceID"/>
 			<int key="maxID">142</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
+++ b/Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
@ -2803,10 +2803,6 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/en.lproj/UICallCell.xib
--- a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
+++ b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
+		<int key="IBDocument.SystemTarget">1536</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2549</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">1498</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@ -41,7 +41,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 68}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="735354432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -61,7 +60,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{224, 14}, {25, 25}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -71,7 +69,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{216, 6}, {41, 41}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="242054672"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -116,7 +113,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 68}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1047549470"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -224,54 +220,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">14</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIConferenceHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="pauseButton">UIPauseButton</string>
-						<string key="stateImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="pauseButton">
-							<string key="name">pauseButton</string>
-							<string key="candidateClassName">UIPauseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="stateImage">
-							<string key="name">stateImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIPauseButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIPauseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
@ -280,6 +231,6 @@
 			<string key="call_state_play_over.png">{43, 46}</string>
 			<string key="header_conference.png">{640, 135}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1498</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
--- a/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib
+++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsFooter.xib
@ -163,49 +163,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">10</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
+++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
@ -373,10 +373,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/en.lproj/UIMainBar.xib
@ -702,10 +702,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
@ -1170,10 +1170,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -489,7 +489,7 @@
 							<object class="IBUIButton" id="471717543">
 								<reference key="NSNextResponder" ref="1070539677"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{3, 61}, {77, 68}}</string>
+								<string key="NSFrame">{{3, 58}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
 								<reference key="NSNextKeyView" ref="464536687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@ -528,7 +528,7 @@
 								<reference key="IBUIFont" ref="858493639"/>
 							</object>
 						</array>
-						<string key="NSFrame">{{240, 205}, {80, 129}}</string>
+						<string key="NSFrame">{{240, 208}, {80, 126}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
 						<reference key="NSNextKeyView" ref="322088049"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@ -2605,13 +2605,289 @@
 			<nil key="sourceID"/>
 			<int key="maxID">142</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -2801,10 +2801,6 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallCell.xib
--- a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
+		<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>
@ -219,54 +219,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">14</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIConferenceHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="pauseButton">UIPauseButton</string>
-						<string key="stateImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="pauseButton">
-							<string key="name">pauseButton</string>
-							<string key="candidateClassName">UIPauseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="stateImage">
-							<string key="name">stateImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIPauseButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIPauseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -162,49 +162,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">10</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -423,10 +423,6 @@ AAgACAAIAAEAAQABAAE</bytes>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIMainBar.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -701,10 +701,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -1168,10 +1168,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/PhoneMainView.xib
+++ b/Classes/PhoneMainView.xib
@ -45,7 +45,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{320, 480}</string>
 						<reference key="NSSuperview" ref="891400674"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUITag">1</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -58,7 +57,6 @@
 				</object>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="130212555"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -182,127 +180,13 @@
 			<nil key="sourceID"/>
 			<int key="maxID">217</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">PhoneMainView</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">mainViewController</string>
-						<string key="NS.object.0">UICompositeViewController</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">mainViewController</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">mainViewController</string>
-							<string key="candidateClassName">UICompositeViewController</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PhoneMainView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>landscapeView</string>
-							<string>portraitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIView</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>landscapeView</string>
-							<string>portraitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">landscapeView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">portraitView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICompositeViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentView</string>
-							<string>stateBarView</string>
-							<string>tabBarView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIView</string>
-							<string>UIView</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>contentView</string>
-							<string>stateBarView</string>
-							<string>tabBarView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">contentView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">stateBarView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">tabBarView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICompositeViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@ -41,8 +41,11 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
    if (contact && ABPersonHasImageData(contact)) {
        CFDataRef imgData = ABPersonCopyImageDataWithFormat(contact, thumbnail? 
                                                            kABPersonImageFormatThumbnail: kABPersonImageFormatOriginalSize);
+        
        retImage = [UIImage imageWithData:(NSData *)imgData];
-        CFRelease(imgData);    
+        if(imgData != NULL) {
+            CFRelease(imgData);
+        }
    }
    return retImage;
 }
--- a/Classes/en.lproj/ChatRoomViewController.xib
+++ b/Classes/en.lproj/ChatRoomViewController.xib
@ -54,7 +54,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{-13, -5}, {131, 107}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="495119736"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -69,7 +68,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 6}, {65, 65}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="578164845"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -89,7 +87,6 @@
 										<int key="NSvFlags">290</int>
 										<string key="NSFrame">{{101, 37}, {199, 43}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="879615756"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -122,7 +119,6 @@
 								</array>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="934483770"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="460939904">
@ -137,7 +133,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{0, 80}, {320, 279}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="229066993"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
@ -163,7 +158,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 57}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="164391443"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -179,7 +173,6 @@
 										<int key="NSvFlags">297</int>
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="833509359"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -222,7 +215,6 @@
 										<int key="NSvFlags">298</int>
 										<string key="NSFrame">{{20, 24}, {222, 9}}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="391057061"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -236,7 +228,6 @@
 								</array>
 								<string key="NSFrame">{{0, 359}, {320, 57}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="661332796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -251,7 +242,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 57}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="120263452"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -267,7 +257,6 @@
 										<int key="NSvFlags">297</int>
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -324,7 +313,6 @@
 										<int key="NSvFlags">300</int>
 										<string key="NSFrameSize">{35, 57}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="587350058"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -362,7 +350,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrame">{{39, 12}, {218, 33}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="487645621"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -371,7 +358,6 @@
 								</array>
 								<string key="NSFrame">{{0, 359}, {320, 57}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131075038"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -380,7 +366,6 @@
 						</array>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="414508017"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -395,7 +380,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="544154475"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -410,7 +394,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="602867427"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="539084523">
@ -452,7 +435,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="715329044"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="789751385"/>
@ -492,7 +474,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="393955689"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -507,7 +488,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="369975984"/>
-								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -519,7 +499,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="764397421"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -534,7 +513,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="333187864"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -1000,170 +978,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">93</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onEditClick:">id</string>
-						<string key="onListTap:">id</string>
-						<string key="onMessageChange:">id</string>
-						<string key="onPictureClick:">id</string>
-						<string key="onSendClick:">id</string>
-						<string key="onTransferCancelClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onListTap:">
-							<string key="name">onListTap:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onMessageChange:">
-							<string key="name">onMessageChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onPictureClick:">
-							<string key="name">onPictureClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSendClick:">
-							<string key="name">onSendClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onTransferCancelClick:">
-							<string key="name">onTransferCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="cancelTransferButton">UIButton</string>
-						<string key="chatView">UIView</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="headerView">UIView</string>
-						<string key="imageTransferProgressBar">UIProgressView</string>
-						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
-						<string key="messageBackgroundImage">UIImageView</string>
-						<string key="messageField">HPGrowingTextView</string>
-						<string key="messageView">UIView</string>
-						<string key="pictureButton">UIButton</string>
-						<string key="sendButton">UIButton</string>
-						<string key="tableController">ChatRoomTableViewController</string>
-						<string key="transferBackgroundImage">UIImageView</string>
-						<string key="transferView">UIView</string>
-						<string key="waitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="cancelTransferButton">
-							<string key="name">cancelTransferButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatView">
-							<string key="name">chatView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerView">
-							<string key="name">headerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
-							<string key="name">imageTransferProgressBar</string>
-							<string key="candidateClassName">UIProgressView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
-							<string key="name">listTapGestureRecognizer</string>
-							<string key="candidateClassName">UITapGestureRecognizer</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
-							<string key="name">messageBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageField">
-							<string key="name">messageField</string>
-							<string key="candidateClassName">HPGrowingTextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageView">
-							<string key="name">messageView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="pictureButton">
-							<string key="name">pictureButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sendButton">
-							<string key="name">sendButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatRoomTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferBackgroundImage">
-							<string key="name">transferBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferView">
-							<string key="name">transferView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HPGrowingTextView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HPGrowingTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</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>
--- a/Classes/en.lproj/ChatViewController.xib
+++ b/Classes/en.lproj/ChatViewController.xib
@ -48,7 +48,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -63,7 +62,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1001279594"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -114,7 +112,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="585481821"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -156,7 +153,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="428805768"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -173,7 +169,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 79}, {320, 381}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -206,7 +201,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{2, 44}, {316, 35}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="69932958"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="618747657">
@ -250,7 +244,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="852221244"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="618747657"/>
@ -457,100 +450,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">28</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddClick:">
-							<string key="name">onAddClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressField">UITextField</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ChatTableViewController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TUNinePatch</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TUNinePatch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILinphoneTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<string key="NS.object.0">TUNinePatch</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">backgroundNinePatch</string>
-							<string key="candidateClassName">TUNinePatch</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/ContactDetailsLabelViewController.xib
+++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib
@ -42,7 +42,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="786589861"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -64,7 +63,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="786589861"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1031075615"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -79,7 +77,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="786589861"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1001416449"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -128,7 +125,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="868223268"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -145,7 +141,6 @@
 						<int key="NSvFlags">306</int>
 						<string key="NSFrame">{{0, 59}, {320, 401}}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -175,7 +170,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="143170749"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -313,46 +307,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">16</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsLabelViewController</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>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">tableView</string>
-						<string key="NS.object.0">UITableView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">tableView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsLabelViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/ContactDetailsViewController.xib
+++ b/Classes/en.lproj/ContactDetailsViewController.xib
@ -48,7 +48,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="40094652"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -63,7 +62,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="827146159"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -110,7 +108,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="100677920"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -148,7 +145,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="685526080"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -187,7 +183,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="463087888"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -204,7 +199,6 @@
 						<int key="NSvFlags">306</int>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -234,7 +228,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="624008635"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -529,188 +522,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="footerController">UIContactDetailsFooter</string>
-						<string key="headerController">UIContactDetailsHeader</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="footerController">
-							<string key="name">footerController</string>
-							<string key="candidateClassName">UIContactDetailsFooter</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerController">
-							<string key="name">headerController</string>
-							<string key="candidateClassName">UIContactDetailsHeader</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="cancelButton">UIButton</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ContactDetailsTableViewController</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="cancelButton">
-							<string key="name">cancelButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactDetailsTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onAvatarClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="contactDetailsDelegate">id</string>
-						<string key="editView">UIView</string>
-						<string key="normalView">UIView</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editView">
-							<string key="name">editView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="normalView">
-							<string key="name">normalView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/ContactsViewController.xib
+++ b/Classes/en.lproj/ContactsViewController.xib
@ -47,7 +47,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="600417980"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -66,7 +65,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrameSize">{107, 44}</string>
 										<reference key="NSSuperview" ref="160793557"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="596330568"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -119,7 +117,6 @@
 										<int key="NSvFlags">289</int>
 										<string key="NSFrame">{{107, 0}, {107, 44}}</string>
 										<reference key="NSSuperview" ref="160793557"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="562388802"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -154,7 +151,6 @@
 								</array>
 								<string key="NSFrame">{{106, 0}, {214, 44}}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257572356"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -171,7 +167,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{107, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1037245389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -219,7 +214,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{107, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="160793557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -252,7 +246,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="958933557"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -267,7 +260,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:10</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -299,7 +291,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="95706395"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -564,90 +555,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">94</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAllClick:">id</string>
-						<string key="onBackClick:">id</string>
-						<string key="onLinphoneClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAllClick:">
-							<string key="name">onAllClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onLinphoneClick:">
-							<string key="name">onLinphoneClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addButton">UIButton</string>
-						<string key="allButton">UIButton</string>
-						<string key="backButton">UIButton</string>
-						<string key="linphoneButton">UIButton</string>
-						<string key="tableController">ContactsTableViewController</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addButton">
-							<string key="name">addButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="allButton">
-							<string key="name">allButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="linphoneButton">
-							<string key="name">linphoneButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactsTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/DialerViewController~ipad.xib
+++ b/Classes/en.lproj/DialerViewController~ipad.xib
@ -42,7 +42,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{127, 200}, {510, 460}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="811328787"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@ -58,7 +57,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="935083036"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -72,7 +70,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="857979271"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
 							<int key="NSColorSpace">3</int>
@ -86,7 +83,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{20, 90}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="422247190"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -129,7 +125,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="33995646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -144,7 +139,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 80}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="770143841"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -160,7 +154,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{700, 60}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1069606219"/>
 								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIOpaque">NO</bool>
@ -199,7 +192,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -235,7 +227,6 @@
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="885330675"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -250,7 +241,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{320, 280}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257730270"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -266,7 +256,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="579980565"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -302,7 +291,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="534491605"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -329,7 +317,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405606838"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -356,7 +343,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="984444210"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -383,7 +369,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="505513327"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -410,7 +395,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="829692929"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -437,7 +421,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="430965229"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -464,7 +447,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="565116665"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -491,7 +473,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="47810246"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -518,7 +499,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="776264615"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -545,7 +525,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="718499319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -572,7 +551,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="683359487"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -597,7 +575,6 @@
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -612,7 +589,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405746031"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -646,7 +622,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="981547916"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -679,7 +654,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="514058756"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -713,7 +687,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1043651254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -747,8 +720,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -779,7 +750,6 @@
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="169100052"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -794,7 +764,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -1469,268 +1438,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">79</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">DialerViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAddressChange:">id</string>
-						<string key="onBackClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAddressChange:">
-							<string key="name">onAddressChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addCallButton">UICallButton</string>
-						<string key="addContactButton">UIButton</string>
-						<string key="addressField">UITextField</string>
-						<string key="backButton">UIButton</string>
-						<string key="backgroundView">UIView</string>
-						<string key="callButton">UICallButton</string>
-						<string key="eightButton">UIDigitButton</string>
-						<string key="eraseButton">UIEraseButton</string>
-						<string key="fiveButton">UIDigitButton</string>
-						<string key="fourButton">UIDigitButton</string>
-						<string key="nineButton">UIDigitButton</string>
-						<string key="oneButton">UIDigitButton</string>
-						<string key="sevenButton">UIDigitButton</string>
-						<string key="sharpButton">UIDigitButton</string>
-						<string key="sixButton">UIDigitButton</string>
-						<string key="starButton">UIDigitButton</string>
-						<string key="threeButton">UIDigitButton</string>
-						<string key="transferButton">UITransferButton</string>
-						<string key="twoButton">UIDigitButton</string>
-						<string key="videoCameraSwitch">UICamSwitch</string>
-						<string key="videoPreview">UIView</string>
-						<string key="zeroButton">UIDigitButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addCallButton">
-							<string key="name">addCallButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addContactButton">
-							<string key="name">addContactButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backgroundView">
-							<string key="name">backgroundView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callButton">
-							<string key="name">callButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eightButton">
-							<string key="name">eightButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eraseButton">
-							<string key="name">eraseButton</string>
-							<string key="candidateClassName">UIEraseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fiveButton">
-							<string key="name">fiveButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fourButton">
-							<string key="name">fourButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="nineButton">
-							<string key="name">nineButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="oneButton">
-							<string key="name">oneButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sevenButton">
-							<string key="name">sevenButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sharpButton">
-							<string key="name">sharpButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sixButton">
-							<string key="name">sixButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="starButton">
-							<string key="name">starButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="threeButton">
-							<string key="name">threeButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferButton">
-							<string key="name">transferButton</string>
-							<string key="candidateClassName">UITransferButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="twoButton">
-							<string key="name">twoButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
-							<string key="name">videoCameraSwitch</string>
-							<string key="candidateClassName">UICamSwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoPreview">
-							<string key="name">videoPreview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="zeroButton">
-							<string key="name">zeroButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/DialerViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIAddressTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIAddressTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICallButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICallButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICamSwitch</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">preview</string>
-						<string key="NS.object.0">UIView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">preview</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">preview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICamSwitch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIDigitButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIDigitButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIEraseButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIEraseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILongTouchButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILongTouchButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITransferButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UITransferButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/FirstLoginViewController.xib
+++ b/Classes/en.lproj/FirstLoginViewController.xib
@ -46,7 +46,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{33, 312}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="731646357"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -93,7 +92,6 @@
 						<int key="NSvFlags">-2147483379</int>
 						<string key="NSFrame">{{60, 420}, {200, 37}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -125,7 +123,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{60, 170}, {200, 31}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="415396672"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -168,7 +165,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{60, 220}, {200, 31}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="967202684"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -207,7 +203,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="210410556"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="300056741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -220,7 +215,6 @@
 						</object>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="871218378"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -233,7 +227,6 @@
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="210410556"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -453,114 +446,13 @@
 			<nil key="sourceID"/>
 			<int key="maxID">66</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstLoginViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">onLoginClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">onSiteClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">loginButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">passwordField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">siteButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">usernameField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">waitView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/FirstLoginViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/Classes/en.lproj/HistoryDetailsViewController.xib
+++ b/Classes/en.lproj/HistoryDetailsViewController.xib
@ -838,10 +838,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/HistoryViewController.xib
+++ b/Classes/en.lproj/HistoryViewController.xib
@ -562,10 +562,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/ImageViewController.xib
+++ b/Classes/en.lproj/ImageViewController.xib
@ -252,10 +252,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/InCallViewController.xib
+++ b/Classes/en.lproj/InCallViewController.xib
@ -447,10 +447,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/Classes/en.lproj/IncomingCallViewController.xib
+++ b/Classes/en.lproj/IncomingCallViewController.xib
@ -4836,10 +4836,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/WizardViewController.xib
+++ b/Classes/en.lproj/WizardViewController.xib
@ -425,10 +425,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/WizardViewController~ipad.xib
+++ b/Classes/en.lproj/WizardViewController~ipad.xib
@ -770,10 +770,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/en.lproj/WizardViews.xib
+++ b/Classes/en.lproj/WizardViews.xib
@ -1538,10 +1538,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/ChatRoomViewController.xib
+++ b/Classes/fr.lproj/ChatRoomViewController.xib
@ -977,170 +977,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">93</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onEditClick:">id</string>
-						<string key="onListTap:">id</string>
-						<string key="onMessageChange:">id</string>
-						<string key="onPictureClick:">id</string>
-						<string key="onSendClick:">id</string>
-						<string key="onTransferCancelClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onListTap:">
-							<string key="name">onListTap:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onMessageChange:">
-							<string key="name">onMessageChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onPictureClick:">
-							<string key="name">onPictureClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSendClick:">
-							<string key="name">onSendClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onTransferCancelClick:">
-							<string key="name">onTransferCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="cancelTransferButton">UIButton</string>
-						<string key="chatView">UIView</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="headerView">UIView</string>
-						<string key="imageTransferProgressBar">UIProgressView</string>
-						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
-						<string key="messageBackgroundImage">UIImageView</string>
-						<string key="messageField">HPGrowingTextView</string>
-						<string key="messageView">UIView</string>
-						<string key="pictureButton">UIButton</string>
-						<string key="sendButton">UIButton</string>
-						<string key="tableController">ChatRoomTableViewController</string>
-						<string key="transferBackgroundImage">UIImageView</string>
-						<string key="transferView">UIView</string>
-						<string key="waitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="cancelTransferButton">
-							<string key="name">cancelTransferButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatView">
-							<string key="name">chatView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerView">
-							<string key="name">headerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
-							<string key="name">imageTransferProgressBar</string>
-							<string key="candidateClassName">UIProgressView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
-							<string key="name">listTapGestureRecognizer</string>
-							<string key="candidateClassName">UITapGestureRecognizer</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
-							<string key="name">messageBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageField">
-							<string key="name">messageField</string>
-							<string key="candidateClassName">HPGrowingTextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageView">
-							<string key="name">messageView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="pictureButton">
-							<string key="name">pictureButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sendButton">
-							<string key="name">sendButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatRoomTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferBackgroundImage">
-							<string key="name">transferBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferView">
-							<string key="name">transferView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HPGrowingTextView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HPGrowingTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</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>
--- a/Classes/fr.lproj/ChatViewController.xib
+++ b/Classes/fr.lproj/ChatViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -449,100 +449,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">28</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddClick:">
-							<string key="name">onAddClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressField">UITextField</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ChatTableViewController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TUNinePatch</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TUNinePatch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILinphoneTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<string key="NS.object.0">TUNinePatch</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">backgroundNinePatch</string>
-							<string key="candidateClassName">TUNinePatch</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/ContactDetailsLabelViewController.xib
+++ b/Classes/fr.lproj/ContactDetailsLabelViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -194,7 +194,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 										</object>
 									</array>
 								</array>
-								<object class="NSColor" key="NSColor" id="432239041">
+								<object class="NSColor" key="NSColor" id="371591759">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MCAwAA</bytes>
 								</object>
@ -224,7 +224,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSNextKeyView" ref="143170749"/>
-				<reference key="IBUIBackgroundColor" ref="432239041"/>
+				<reference key="IBUIBackgroundColor" ref="371591759"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 		</array>
@ -357,46 +357,9 @@ AAgACAAIAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">16</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsLabelViewController</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>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">tableView</string>
-						<string key="NS.object.0">UITableView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">tableView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsLabelViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/ContactDetailsViewController.xib
+++ b/Classes/fr.lproj/ContactDetailsViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -252,7 +252,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 										</object>
 									</array>
 								</array>
-								<object class="NSColor" key="NSColor" id="247151900">
+								<object class="NSColor" key="NSColor" id="231790576">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MCAwAA</bytes>
 								</object>
@ -282,7 +282,7 @@ AAgACAAIAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSNextKeyView" ref="624008635"/>
-				<reference key="IBUIBackgroundColor" ref="247151900"/>
+				<reference key="IBUIBackgroundColor" ref="231790576"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUITableViewController" id="537601624">
@ -572,188 +572,9 @@ AAgACAAIAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="footerController">UIContactDetailsFooter</string>
-						<string key="headerController">UIContactDetailsHeader</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="footerController">
-							<string key="name">footerController</string>
-							<string key="candidateClassName">UIContactDetailsFooter</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerController">
-							<string key="name">headerController</string>
-							<string key="candidateClassName">UIContactDetailsHeader</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="cancelButton">UIButton</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ContactDetailsTableViewController</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="cancelButton">
-							<string key="name">cancelButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactDetailsTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onAvatarClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="contactDetailsDelegate">id</string>
-						<string key="editView">UIView</string>
-						<string key="normalView">UIView</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editView">
-							<string key="name">editView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="normalView">
-							<string key="name">normalView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/ContactsViewController.xib
+++ b/Classes/fr.lproj/ContactsViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -554,90 +554,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">94</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAllClick:">id</string>
-						<string key="onBackClick:">id</string>
-						<string key="onLinphoneClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAllClick:">
-							<string key="name">onAllClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onLinphoneClick:">
-							<string key="name">onLinphoneClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addButton">UIButton</string>
-						<string key="allButton">UIButton</string>
-						<string key="backButton">UIButton</string>
-						<string key="linphoneButton">UIButton</string>
-						<string key="tableController">ContactsTableViewController</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addButton">
-							<string key="name">addButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="allButton">
-							<string key="name">allButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="linphoneButton">
-							<string key="name">linphoneButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactsTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/DialerViewController~ipad.xib
+++ b/Classes/fr.lproj/DialerViewController~ipad.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -1437,268 +1437,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">79</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">DialerViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAddressChange:">id</string>
-						<string key="onBackClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAddressChange:">
-							<string key="name">onAddressChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addCallButton">UICallButton</string>
-						<string key="addContactButton">UIButton</string>
-						<string key="addressField">UITextField</string>
-						<string key="backButton">UIButton</string>
-						<string key="backgroundView">UIView</string>
-						<string key="callButton">UICallButton</string>
-						<string key="eightButton">UIDigitButton</string>
-						<string key="eraseButton">UIEraseButton</string>
-						<string key="fiveButton">UIDigitButton</string>
-						<string key="fourButton">UIDigitButton</string>
-						<string key="nineButton">UIDigitButton</string>
-						<string key="oneButton">UIDigitButton</string>
-						<string key="sevenButton">UIDigitButton</string>
-						<string key="sharpButton">UIDigitButton</string>
-						<string key="sixButton">UIDigitButton</string>
-						<string key="starButton">UIDigitButton</string>
-						<string key="threeButton">UIDigitButton</string>
-						<string key="transferButton">UITransferButton</string>
-						<string key="twoButton">UIDigitButton</string>
-						<string key="videoCameraSwitch">UICamSwitch</string>
-						<string key="videoPreview">UIView</string>
-						<string key="zeroButton">UIDigitButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addCallButton">
-							<string key="name">addCallButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addContactButton">
-							<string key="name">addContactButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backgroundView">
-							<string key="name">backgroundView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callButton">
-							<string key="name">callButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eightButton">
-							<string key="name">eightButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eraseButton">
-							<string key="name">eraseButton</string>
-							<string key="candidateClassName">UIEraseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fiveButton">
-							<string key="name">fiveButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fourButton">
-							<string key="name">fourButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="nineButton">
-							<string key="name">nineButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="oneButton">
-							<string key="name">oneButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sevenButton">
-							<string key="name">sevenButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sharpButton">
-							<string key="name">sharpButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sixButton">
-							<string key="name">sixButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="starButton">
-							<string key="name">starButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="threeButton">
-							<string key="name">threeButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferButton">
-							<string key="name">transferButton</string>
-							<string key="candidateClassName">UITransferButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="twoButton">
-							<string key="name">twoButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
-							<string key="name">videoCameraSwitch</string>
-							<string key="candidateClassName">UICamSwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoPreview">
-							<string key="name">videoPreview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="zeroButton">
-							<string key="name">zeroButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/DialerViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIAddressTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIAddressTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICallButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICallButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICamSwitch</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">preview</string>
-						<string key="NS.object.0">UIView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">preview</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">preview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICamSwitch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIDigitButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIDigitButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIEraseButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIEraseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILongTouchButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILongTouchButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITransferButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UITransferButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/FirstLoginViewController.xib
+++ b/Classes/fr.lproj/FirstLoginViewController.xib
@ -445,114 +445,13 @@
 			<nil key="sourceID"/>
 			<int key="maxID">66</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstLoginViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">onLoginClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">onSiteClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">loginButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">passwordField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">siteButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">usernameField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">waitView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/FirstLoginViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/Classes/fr.lproj/HistoryDetailsViewController.xib
+++ b/Classes/fr.lproj/HistoryDetailsViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -837,10 +837,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/HistoryViewController.xib
+++ b/Classes/fr.lproj/HistoryViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -561,10 +561,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/ImageViewController.xib
+++ b/Classes/fr.lproj/ImageViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -251,10 +251,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/InCallViewController.xib
+++ b/Classes/fr.lproj/InCallViewController.xib
@ -446,10 +446,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/Classes/fr.lproj/IncomingCallViewController.xib
+++ b/Classes/fr.lproj/IncomingCallViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -4835,10 +4835,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/WizardViewController.xib
+++ b/Classes/fr.lproj/WizardViewController.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -424,10 +424,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/WizardViewController~ipad.xib
+++ b/Classes/fr.lproj/WizardViewController~ipad.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -768,10 +768,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Classes/fr.lproj/WizardViews.xib
+++ b/Classes/fr.lproj/WizardViews.xib
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
+		<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>
@ -1526,10 +1526,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/Resources/en.lproj/Localizable.strings
+++ b/Resources/en.lproj/Localizable.strings
--- a/Resources/fr.lproj/Localizable.strings
+++ b/Resources/fr.lproj/Localizable.strings
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
--- a/linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib
@ -54,7 +54,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{-13, -5}, {131, 107}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="495119736"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -69,7 +68,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 6}, {65, 65}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="578164845"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -89,7 +87,6 @@
 										<int key="NSvFlags">290</int>
 										<string key="NSFrame">{{101, 37}, {199, 43}}</string>
 										<reference key="NSSuperview" ref="414508017"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="879615756"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -122,7 +119,6 @@
 								</array>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="934483770"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="460939904">
@ -137,7 +133,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{0, 80}, {320, 279}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="229066993"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
@ -163,7 +158,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 57}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="164391443"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -179,7 +173,6 @@
 										<int key="NSvFlags">297</int>
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="833509359"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -222,7 +215,6 @@
 										<int key="NSvFlags">298</int>
 										<string key="NSFrame">{{20, 24}, {222, 9}}</string>
 										<reference key="NSSuperview" ref="229066993"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="391057061"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -236,7 +228,6 @@
 								</array>
 								<string key="NSFrame">{{0, 359}, {320, 57}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="661332796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -251,7 +242,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 57}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="120263452"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -267,7 +257,6 @@
 										<int key="NSvFlags">297</int>
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -324,7 +313,6 @@
 										<int key="NSvFlags">300</int>
 										<string key="NSFrameSize">{35, 57}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="587350058"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -362,7 +350,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrame">{{39, 12}, {218, 33}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="487645621"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -371,7 +358,6 @@
 								</array>
 								<string key="NSFrame">{{0, 359}, {320, 57}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131075038"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -380,7 +366,6 @@
 						</array>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="414508017"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -395,7 +380,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="544154475"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -410,7 +394,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="602867427"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor" id="539084523">
@ -452,7 +435,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="333187864"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="715329044"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="789751385"/>
@ -492,7 +474,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="393955689"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -507,7 +488,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="369975984"/>
-								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -519,7 +499,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="589117993"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="764397421"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -534,7 +513,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="333187864"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="460939904"/>
@ -1000,170 +978,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">93</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatRoomViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onEditClick:">id</string>
-						<string key="onListTap:">id</string>
-						<string key="onMessageChange:">id</string>
-						<string key="onPictureClick:">id</string>
-						<string key="onSendClick:">id</string>
-						<string key="onTransferCancelClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onListTap:">
-							<string key="name">onListTap:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onMessageChange:">
-							<string key="name">onMessageChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onPictureClick:">
-							<string key="name">onPictureClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSendClick:">
-							<string key="name">onSendClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onTransferCancelClick:">
-							<string key="name">onTransferCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="cancelTransferButton">UIButton</string>
-						<string key="chatView">UIView</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="headerView">UIView</string>
-						<string key="imageTransferProgressBar">UIProgressView</string>
-						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
-						<string key="messageBackgroundImage">UIImageView</string>
-						<string key="messageField">HPGrowingTextView</string>
-						<string key="messageView">UIView</string>
-						<string key="pictureButton">UIButton</string>
-						<string key="sendButton">UIButton</string>
-						<string key="tableController">ChatRoomTableViewController</string>
-						<string key="transferBackgroundImage">UIImageView</string>
-						<string key="transferView">UIView</string>
-						<string key="waitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="cancelTransferButton">
-							<string key="name">cancelTransferButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatView">
-							<string key="name">chatView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerView">
-							<string key="name">headerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
-							<string key="name">imageTransferProgressBar</string>
-							<string key="candidateClassName">UIProgressView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
-							<string key="name">listTapGestureRecognizer</string>
-							<string key="candidateClassName">UITapGestureRecognizer</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
-							<string key="name">messageBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageField">
-							<string key="name">messageField</string>
-							<string key="candidateClassName">HPGrowingTextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageView">
-							<string key="name">messageView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="pictureButton">
-							<string key="name">pictureButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sendButton">
-							<string key="name">sendButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatRoomTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferBackgroundImage">
-							<string key="name">transferBackgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferView">
-							<string key="name">transferView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatRoomViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">HPGrowingTextView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/HPGrowingTextView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</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>
--- a/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib
@ -48,7 +48,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -63,7 +62,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1001279594"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -114,7 +112,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="585481821"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -156,7 +153,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="428805768"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -173,7 +169,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 79}, {320, 381}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -206,7 +201,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{2, 44}, {316, 35}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="69932958"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="618747657">
@ -250,7 +244,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="852221244"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="618747657"/>
@ -457,100 +450,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">28</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ChatViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddClick:">
-							<string key="name">onAddClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressField">UITextField</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ChatTableViewController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ChatTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ChatViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TUNinePatch</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TUNinePatch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILinphoneTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<string key="NS.object.0">TUNinePatch</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">backgroundNinePatch</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">backgroundNinePatch</string>
-							<string key="candidateClassName">TUNinePatch</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib
+++ b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib
@ -42,7 +42,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="786589861"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -64,7 +63,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="786589861"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1031075615"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -79,7 +77,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="786589861"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1001416449"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -128,7 +125,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="868223268"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -145,7 +141,6 @@
 						<int key="NSvFlags">306</int>
 						<string key="NSFrame">{{0, 59}, {320, 401}}</string>
 						<reference key="NSSuperview" ref="1031663480"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -175,7 +170,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="143170749"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -313,46 +307,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">16</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsLabelViewController</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>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">tableView</string>
-						<string key="NS.object.0">UITableView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">tableView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsLabelViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib
+++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib
@ -48,7 +48,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="40094652"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -63,7 +62,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="827146159"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -110,7 +108,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="100677920"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -148,7 +145,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="685526080"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -187,7 +183,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="463087888"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -204,7 +199,6 @@
 						<int key="NSvFlags">306</int>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -234,7 +228,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="624008635"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -529,188 +522,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="footerController">UIContactDetailsFooter</string>
-						<string key="headerController">UIContactDetailsHeader</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="footerController">
-							<string key="name">footerController</string>
-							<string key="candidateClassName">UIContactDetailsFooter</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="headerController">
-							<string key="name">headerController</string>
-							<string key="candidateClassName">UIContactDetailsHeader</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactDetailsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onEditClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onEditClick:">
-							<string key="name">onEditClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="cancelButton">UIButton</string>
-						<string key="editButton">UIToggleButton</string>
-						<string key="tableController">ContactDetailsTableViewController</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="cancelButton">
-							<string key="name">cancelButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editButton">
-							<string key="name">editButton</string>
-							<string key="candidateClassName">UIToggleButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactDetailsTableViewController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactDetailsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onAvatarClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onAvatarClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-						<string key="contactDetailsDelegate">id</string>
-						<string key="editView">UIView</string>
-						<string key="normalView">UIView</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="editView">
-							<string key="name">editView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="normalView">
-							<string key="name">normalView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib
+++ b/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib
@ -47,7 +47,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="600417980"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -66,7 +65,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrameSize">{107, 44}</string>
 										<reference key="NSSuperview" ref="160793557"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="596330568"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -119,7 +117,6 @@
 										<int key="NSvFlags">289</int>
 										<string key="NSFrame">{{107, 0}, {107, 44}}</string>
 										<reference key="NSSuperview" ref="160793557"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="562388802"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@ -154,7 +151,6 @@
 								</array>
 								<string key="NSFrame">{{106, 0}, {214, 44}}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257572356"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -171,7 +167,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{107, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1037245389"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -219,7 +214,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{107, 44}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="160793557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -252,7 +246,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="958933557"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -267,7 +260,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:10</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -299,7 +291,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="95706395"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -564,90 +555,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">94</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAllClick:">id</string>
-						<string key="onBackClick:">id</string>
-						<string key="onLinphoneClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAllClick:">
-							<string key="name">onAllClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onLinphoneClick:">
-							<string key="name">onLinphoneClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addButton">UIButton</string>
-						<string key="allButton">UIButton</string>
-						<string key="backButton">UIButton</string>
-						<string key="linphoneButton">UIButton</string>
-						<string key="tableController">ContactsTableViewController</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addButton">
-							<string key="name">addButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="allButton">
-							<string key="name">allButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="linphoneButton">
-							<string key="name">linphoneButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactsTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib
@ -42,7 +42,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{127, 200}, {510, 460}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="811328787"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@ -58,7 +57,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="935083036"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -72,7 +70,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="857979271"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
 							<int key="NSColorSpace">3</int>
@ -86,7 +83,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{20, 90}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="422247190"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -129,7 +125,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="33995646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -144,7 +139,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 80}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="770143841"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -160,7 +154,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{700, 60}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1069606219"/>
 								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIOpaque">NO</bool>
@ -199,7 +192,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -235,7 +227,6 @@
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="885330675"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -250,7 +241,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{320, 280}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257730270"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -266,7 +256,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="579980565"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -302,7 +291,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="534491605"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -329,7 +317,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405606838"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -356,7 +343,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="984444210"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -383,7 +369,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="505513327"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -410,7 +395,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="829692929"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -437,7 +421,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="430965229"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -464,7 +447,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="565116665"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -491,7 +473,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="47810246"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -518,7 +499,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="776264615"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -545,7 +525,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="718499319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -572,7 +551,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="683359487"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -597,7 +575,6 @@
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -612,7 +589,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405746031"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -646,7 +622,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="981547916"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -679,7 +654,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="514058756"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -713,7 +687,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1043651254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -747,8 +720,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@ -779,7 +750,6 @@
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="169100052"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -794,7 +764,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
@ -1469,268 +1438,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">79</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">DialerViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAddContactClick:">id</string>
-						<string key="onAddressChange:">id</string>
-						<string key="onBackClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAddContactClick:">
-							<string key="name">onAddContactClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onAddressChange:">
-							<string key="name">onAddressChange:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addCallButton">UICallButton</string>
-						<string key="addContactButton">UIButton</string>
-						<string key="addressField">UITextField</string>
-						<string key="backButton">UIButton</string>
-						<string key="backgroundView">UIView</string>
-						<string key="callButton">UICallButton</string>
-						<string key="eightButton">UIDigitButton</string>
-						<string key="eraseButton">UIEraseButton</string>
-						<string key="fiveButton">UIDigitButton</string>
-						<string key="fourButton">UIDigitButton</string>
-						<string key="nineButton">UIDigitButton</string>
-						<string key="oneButton">UIDigitButton</string>
-						<string key="sevenButton">UIDigitButton</string>
-						<string key="sharpButton">UIDigitButton</string>
-						<string key="sixButton">UIDigitButton</string>
-						<string key="starButton">UIDigitButton</string>
-						<string key="threeButton">UIDigitButton</string>
-						<string key="transferButton">UITransferButton</string>
-						<string key="twoButton">UIDigitButton</string>
-						<string key="videoCameraSwitch">UICamSwitch</string>
-						<string key="videoPreview">UIView</string>
-						<string key="zeroButton">UIDigitButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addCallButton">
-							<string key="name">addCallButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addContactButton">
-							<string key="name">addContactButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="addressField">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="backgroundView">
-							<string key="name">backgroundView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="callButton">
-							<string key="name">callButton</string>
-							<string key="candidateClassName">UICallButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eightButton">
-							<string key="name">eightButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="eraseButton">
-							<string key="name">eraseButton</string>
-							<string key="candidateClassName">UIEraseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fiveButton">
-							<string key="name">fiveButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fourButton">
-							<string key="name">fourButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="nineButton">
-							<string key="name">nineButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="oneButton">
-							<string key="name">oneButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sevenButton">
-							<string key="name">sevenButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sharpButton">
-							<string key="name">sharpButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sixButton">
-							<string key="name">sixButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="starButton">
-							<string key="name">starButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="threeButton">
-							<string key="name">threeButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="transferButton">
-							<string key="name">transferButton</string>
-							<string key="candidateClassName">UITransferButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="twoButton">
-							<string key="name">twoButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
-							<string key="name">videoCameraSwitch</string>
-							<string key="candidateClassName">UICamSwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="videoPreview">
-							<string key="name">videoPreview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="zeroButton">
-							<string key="name">zeroButton</string>
-							<string key="candidateClassName">UIDigitButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/DialerViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIAddressTextField</string>
-					<string key="superclassName">UITextField</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIAddressTextField.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICallButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICallButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICamSwitch</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">preview</string>
-						<string key="NS.object.0">UIView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">preview</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">preview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICamSwitch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIDigitButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIDigitButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIEraseButton</string>
-					<string key="superclassName">UILongTouchButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIEraseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UILongTouchButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UILongTouchButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UITransferButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">addressField</string>
-						<string key="NS.object.0">UITextField</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">addressField</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">addressField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UITransferButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib
+++ b/linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib
@ -46,7 +46,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{33, 312}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="731646357"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -93,7 +92,6 @@
 						<int key="NSvFlags">-2147483379</int>
 						<string key="NSFrame">{{60, 420}, {200, 37}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -125,7 +123,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{60, 170}, {200, 31}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="415396672"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -168,7 +165,6 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{60, 220}, {200, 31}}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="967202684"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -207,7 +203,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{142, 211}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="210410556"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="300056741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -220,7 +215,6 @@
 						</object>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="988679043"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="871218378"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@ -233,7 +227,6 @@
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="210410556"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -453,114 +446,13 @@
 			<nil key="sourceID"/>
 			<int key="maxID">66</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstLoginViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>onLoginClick:</string>
-							<string>onSiteClick:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">onLoginClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">onSiteClick:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIButton</string>
-							<string>UITextField</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>loginButton</string>
-							<string>passwordField</string>
-							<string>siteButton</string>
-							<string>usernameField</string>
-							<string>waitView</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">loginButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">passwordField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">siteButton</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">usernameField</string>
-								<string key="candidateClassName">UITextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">waitView</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/FirstLoginViewController.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib
+++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib
@ -838,10 +838,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib
+++ b/linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib
@ -562,10 +562,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/ImageViewController/9/ImageViewController.xib
+++ b/linphone.ldb/Resources/Classes/ImageViewController/9/ImageViewController.xib
@ -252,10 +252,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib
+++ b/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib
@ -447,10 +447,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
 			<integer value="784" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
--- a/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib
+++ b/linphone.ldb/Resources/Classes/IncomingCallViewController/4/IncomingCallViewController.xib
@ -4836,10 +4836,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/WizardViewController/15/WizardViewController.xib
+++ b/linphone.ldb/Resources/Classes/WizardViewController/15/WizardViewController.xib
@ -425,10 +425,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/WizardViewController~ipad/11/WizardViewController~ipad.xib
@ -770,10 +770,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib
+++ b/linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib
@ -1538,10 +1538,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib
@ -42,6 +42,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 335}, {320, 125}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@ -63,6 +64,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612787992"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -78,6 +80,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1062143568"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -121,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="843780954"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -148,6 +152,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070521404"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -175,6 +180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="736263510"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -202,6 +208,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="977745568"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -229,6 +236,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="308872469"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -256,6 +264,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809465959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -283,6 +292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="193555513"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -310,6 +320,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="357389737"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -337,6 +348,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="525082175"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -364,6 +376,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="951243834"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -391,6 +404,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="143533231"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -416,6 +430,7 @@
 						</array>
 						<string key="NSFrame">{{20, 57}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="291142801"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
@ -434,6 +449,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 0}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="471717543"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -489,8 +505,9 @@
 							<object class="IBUIButton" id="471717543">
 								<reference key="NSNextResponder" ref="1070539677"/>
 								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{3, 61}, {77, 68}}</string>
+								<string key="NSFrame">{{3, 58}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="464536687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -528,8 +545,9 @@
 								<reference key="IBUIFont" ref="858493639"/>
 							</object>
 						</array>
-						<string key="NSFrame">{{240, 205}, {80, 129}}</string>
+						<string key="NSFrame">{{240, 208}, {80, 126}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="322088049"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -545,6 +563,7 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 135}, {320, 2000}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070539677"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -559,6 +578,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{80, 67}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1016105438"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -605,6 +625,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{20, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="693636558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -617,6 +638,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{80, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="264394465"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -663,6 +685,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{160, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62185125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -709,6 +732,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{240, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="542459126"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -755,6 +779,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351323248"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -791,6 +816,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="99607181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -820,6 +846,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{105, 67}, {111, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="976589610"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -849,6 +876,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="259467918"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -884,6 +912,7 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="262544423"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -893,6 +922,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="556199520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -908,6 +938,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 248}, {480, 72}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="408941248"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@ -930,6 +961,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="519560860"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@ -942,6 +974,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="526609754"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@ -964,6 +997,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="881223252"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -982,6 +1016,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="923486394"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1000,6 +1035,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="121694741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1018,6 +1054,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="30269278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1036,6 +1073,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="625010060"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1054,6 +1092,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="963396110"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1072,6 +1111,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="761686959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1090,6 +1130,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="629341434"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1108,6 +1149,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809495409"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1126,6 +1168,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="94322278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@ -1144,6 +1187,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<int key="IBUITag">14</int>
@ -1159,6 +1203,7 @@
 						</array>
 						<string key="NSFrame">{{91, 0}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="996491821"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1174,6 +1219,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{65, 55}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="173491714"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1215,6 +1261,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 51}, {65, 55}}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="974396983"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1254,6 +1301,7 @@
 						</array>
 						<string key="NSFrame">{{415, 140}, {65, 105}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="294395401"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1269,6 +1317,7 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 82}, {480, 2000}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="557887372"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@ -1283,6 +1332,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{65, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="814604354"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1329,6 +1379,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{79, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528058217"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1341,6 +1392,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{130, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="839169662"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1387,6 +1439,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{285, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="893150238"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1433,6 +1486,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{350, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="889778982"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1479,6 +1533,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="104218181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1512,6 +1567,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="102684796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1541,6 +1597,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{195, 0}, {90, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="594075760"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1570,6 +1627,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="298889112"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@ -1602,6 +1660,7 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="511619008"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -1611,6 +1670,7 @@
 				</array>
 				<string key="NSFrameSize">{480, 320}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="950460796"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
@ -2607,13 +2667,289 @@
 			<nil key="sourceID"/>
 			<int key="maxID">142</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib
@ -2803,10 +2803,6 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib
--- a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
+		<int key="IBDocument.SystemTarget">1536</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2549</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">1498</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@ -41,7 +41,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 68}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="735354432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@ -61,7 +60,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{224, 14}, {25, 25}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -71,7 +69,6 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{216, 6}, {41, 41}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="242054672"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@ -116,7 +113,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 68}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1047549470"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@ -224,54 +220,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">14</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIConferenceHeader</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="pauseButton">UIPauseButton</string>
-						<string key="stateImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="pauseButton">
-							<string key="name">pauseButton</string>
-							<string key="candidateClassName">UIPauseButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="stateImage">
-							<string key="name">stateImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIPauseButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIPauseButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIToggleButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIToggleButton.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
@ -280,6 +231,6 @@
 			<string key="call_state_play_over.png">{43, 46}</string>
 			<string key="header_conference.png">{640, 135}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1498</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
--- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib
@ -163,49 +163,9 @@
 			<nil key="sourceID"/>
 			<int key="maxID">10</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactDetailsFooter</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">onRemoveClick:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">onRemoveClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contactDetailsDelegate">id</string>
-						<string key="removeButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contactDetailsDelegate">
-							<string key="name">contactDetailsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactDetailsFooter.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib
@ -373,10 +373,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib
@ -702,10 +702,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib
@ -1170,10 +1170,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1536" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
--- a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
+++ b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@ -154,6 +154,8 @@
 		D3012CC51610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; };
 		D3012CC616105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; };
 		D3012CC716105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; };
+		D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; };
+		D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; };
 		D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; };
 		D30BBD1915D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; };
 		D3119E7215B6A4710005D4A4 /* contacts_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3119E7015B6A4710005D4A4 /* contacts_back_default.png */; };
@ -1606,6 +1608,8 @@
 		C9C8254B15AE207B00D493FA /* options_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_selected.png; path = Resources/options_selected.png; sourceTree = "<group>"; };
 		C9C8254E15AE256100D493FA /* transfer_call_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = transfer_call_disabled.png; path = Resources/transfer_call_disabled.png; sourceTree = "<group>"; };
 		D3012CC31610467D007CD926 /* linphone_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_logo.png; path = Resources/linphone_logo.png; sourceTree = "<group>"; };
+		D306459C1611EC2900BB571E /* UILoadingImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILoadingImageView.h; sourceTree = "<group>"; };
+		D306459D1611EC2900BB571E /* UILoadingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILoadingImageView.m; sourceTree = "<group>"; };
 		D30BBD1215D3EFEB000F93DD /* ContactDetailsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsDelegate.h; sourceTree = "<group>"; };
 		D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_ok_disabled.png; path = Resources/contact_ok_disabled.png; sourceTree = "<group>"; };
 		D3119E7015B6A4710005D4A4 /* contacts_back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_back_default.png; path = Resources/contacts_back_default.png; sourceTree = "<group>"; };
@ -2695,6 +2699,8 @@
 				D35E91F7160CA4FF0023116B /* UILinphoneButton.m */,
 				D35E91F2160CA10B0023116B /* UILinphoneTextField.h */,
 				D35E91F3160CA10B0023116B /* UILinphoneTextField.m */,
+				D306459C1611EC2900BB571E /* UILoadingImageView.h */,
+				D306459D1611EC2900BB571E /* UILoadingImageView.m */,
 				D32409C1158B49A600C8C119 /* UILongTouchButton.h */,
 				D32409C2158B49A600C8C119 /* UILongTouchButton.m */,
 				D3ED3E841586291B006C0DE4 /* UIMainBar.h */,
@ -4729,6 +4735,7 @@
 				D374D3FD16071762003D25FF /* ImageSharing.m in Sources */,
 				D35E91F4160CA10B0023116B /* UILinphoneTextField.m in Sources */,
 				D35E91F8160CA4FF0023116B /* UILinphoneButton.m in Sources */,
+				D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -4825,6 +4832,7 @@
 				D374D3FE16071762003D25FF /* ImageSharing.m in Sources */,
 				D35E91F5160CA10B0023116B /* UILinphoneTextField.m in Sources */,
 				D35E91F9160CA4FF0023116B /* UILinphoneButton.m in Sources */,
+				D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};