diff --git a/.gitignore b/.gitignore
index 03db204d1..7e8bce008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ liblinphone-sdk
 liblinphone-iphone-sdk*.zip
 xcuserdata/
 Classes/LinphoneIOSVersion.h
+Pods/
+build
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 9b8a46ff1..516d2b1a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,10 +22,10 @@
 	url = git://git.linphone.org/msamr.git
 [submodule "submodules/externals/ffmpeg"]
 	path = submodules/externals/ffmpeg
-	url = git://git.videolan.org/ffmpeg
+	url = git://git.linphone.org/ffmpeg.git
 [submodule "submodules/externals/x264"]
 	path = submodules/externals/x264
-	url = git://git.videolan.org/x264.git
+	url = git://git.linphone.org/x264.git
 	ignore = dirty
 [submodule "submodules/msx264"]
 	path = submodules/msx264
@@ -36,7 +36,7 @@
 	ignore = dirty
 [submodule "submodules/bzrtp"]
 	path = submodules/bzrtp
-	url =  git://git.linphone.org/bzrtp.git 
+	url = git://git.linphone.org/bzrtp.git
 [submodule "submodules/mssilk"]
 	path = submodules/mssilk
 	url = git://git.linphone.org/mssilk.git
@@ -76,3 +76,7 @@
 [submodule "submodules/mswebrtc"]
 	path = submodules/mswebrtc
 	url = git://git.linphone.org/mswebrtc.git
+[submodule "Classes/KIF"]
+	path = Classes/KIF
+	url = https://github.com/kif-framework/KIF.git
+	branch = origin/v3.1.2
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..3a22f99d2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,27 @@
+language: objective-c
+xcode_project: linphone.xcworkspace
+xcode_scheme: linphone
+
+git:
+  submodules: false
+
+env:
+    global:
+        - VERSION="8.1"
+        - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/Screenshots"
+
+install: 
+    - cd submodules/build 
+    - make download-sdk
+    - cd ../..
+    - pod install
+    - ls -la
+
+script:
+    - export KIF_SCREENSHOTS=$TRAVIS_BUILD_DIR/Screenshots
+    - mkdir -p "$KIF_SCREENSHOTS"
+    - echo $KIF_SCREENSHOTS
+    - xcodebuild -scheme linphone -workspace linphone.xcworkspace -sdk iphonesimulator8.1 test
+
+after_failure:
+    - ls -la $KIF_SCREENSHOTS
\ No newline at end of file
diff --git a/.tx/config b/.tx/config
index 7c4b5d562..cf79ceeeb 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,5 @@
 [main]
 host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,sv_SE:sv-rSE,kn_IN:kn-rIN,nl_NL:nl-rNL,en_NL:en-rNL
 minimum_perc = 1
 
 [linphone-ios.localizablestrings]
diff --git a/Classes/Base.lproj/ChatRoomViewController.strings b/Classes/Base.lproj/ChatRoomViewController.strings
index a05025f33..e43729de3 100644
Binary files a/Classes/Base.lproj/ChatRoomViewController.strings and b/Classes/Base.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index 40fd59fd9..9e0649197 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -47,7 +47,7 @@
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="avatar_unknown_small.png" id="41" userLabel="avatarImage">
                                     <rect key="frame" x="20" y="6" width="65" height="65"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                         <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                         <bool key="isElement" value="YES"/>
                                     </accessibility>
@@ -55,7 +55,7 @@
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="40" userLabel="addressLabel">
                                     <rect key="frame" x="101" y="37" width="199" height="43"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's name">
+                                    <accessibility key="accessibilityConfiguration" label="Contact name">
                                         <accessibilityTraits key="traits" none="YES"/>
                                     </accessibility>
                                     <fontDescription key="fontDescription" type="system" pointSize="22"/>
@@ -174,6 +174,9 @@
                                     <rect key="frame" x="39" y="12" width="218" height="33"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    <accessibility key="accessibilityConfiguration" label="Message field">
+                                        <bool key="isElement" value="YES"/>
+                                    </accessibility>
                                 </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.strings b/Classes/Base.lproj/HistoryDetailsViewController.strings
index 2954ead48..9ea355e8d 100644
Binary files a/Classes/Base.lproj/HistoryDetailsViewController.strings and b/Classes/Base.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib
index 3f0d28f4e..05a1ac272 100644
--- a/Classes/Base.lproj/HistoryDetailsViewController.xib
+++ b/Classes/Base.lproj/HistoryDetailsViewController.xib
@@ -102,7 +102,7 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="avatar_unknown_small.png" id="23" userLabel="avatarImage">
                             <rect key="frame" x="20" y="6" width="65" height="65"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
@@ -110,7 +110,7 @@
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="25" userLabel="addressLabel">
                             <rect key="frame" x="101" y="37" width="192" height="43"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="22"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
diff --git a/Classes/Base.lproj/IncomingCallViewController.strings b/Classes/Base.lproj/IncomingCallViewController.strings
index c3aa723a5..1ea6da905 100644
Binary files a/Classes/Base.lproj/IncomingCallViewController.strings and b/Classes/Base.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib
index b7bf28ba6..70078f290 100644
--- a/Classes/Base.lproj/IncomingCallViewController.xib
+++ b/Classes/Base.lproj/IncomingCallViewController.xib
@@ -44,7 +44,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="300" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -56,7 +56,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
                             <rect key="frame" x="80" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.strings b/Classes/Base.lproj/IncomingCallViewController~ipad.strings
index db1fb0f94..c82d0111a 100644
Binary files a/Classes/Base.lproj/IncomingCallViewController~ipad.strings and b/Classes/Base.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.xib b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
index 59ff64f58..d296c73bb 100644
--- a/Classes/Base.lproj/IncomingCallViewController~ipad.xib
+++ b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
@@ -45,7 +45,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="748" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -57,7 +57,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
                             <rect key="frame" x="304" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
@@ -136,7 +136,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="69" userLabel="addressLabel">
                             <rect key="frame" x="10" y="53" width="1004" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
                             <nil key="highlightedColor"/>
@@ -148,7 +148,7 @@
                         <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="71" userLabel="avatarImage">
                             <rect key="frame" x="432" y="113" width="160" height="170"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                 <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                 <bool key="isElement" value="YES"/>
                             </accessibility>
diff --git a/Classes/Base.lproj/WizardViews.strings b/Classes/Base.lproj/WizardViews.strings
index 1f22b0423..8083292b3 100644
Binary files a/Classes/Base.lproj/WizardViews.strings and b/Classes/Base.lproj/WizardViews.strings differ
diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib
index e94a3c355..ccd52f81a 100644
--- a/Classes/Base.lproj/WizardViews.xib
+++ b/Classes/Base.lproj/WizardViews.xib
@@ -135,7 +135,7 @@
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="Kbn-dL-C5h" userLabel="remoteProvisioningButton" customClass="UILinphoneButton">
                     <rect key="frame" x="34" y="327" width="255" height="50"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="Sign in SIP account">
+                    <accessibility key="accessibilityConfiguration" label="Remote provisioning">
                         <bool key="isElement" value="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m
index ef8bf5307..2780d723f 100644
--- a/Classes/ChatRoomTableViewController.m
+++ b/Classes/ChatRoomTableViewController.m
@@ -48,6 +48,7 @@
 }
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
+    self.tableView.accessibilityIdentifier = @"Chat list";
 	[self reloadData];
 }
 
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 480d99e11..458aa7e01 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -298,6 +298,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		ms_free(address);
     }
     [addressLabel setText:displayName];
+    [addressLabel setAccessibilityValue:displayName];
 
     // Avatar
     if(image == nil) {
diff --git a/Classes/ChatTableViewController.m b/Classes/ChatTableViewController.m
index f47aca591..429209d86 100644
--- a/Classes/ChatTableViewController.m
+++ b/Classes/ChatTableViewController.m
@@ -38,11 +38,11 @@
     [super dealloc];
 }
 
-
 #pragma mark - ViewController Functions 
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    self.tableView.accessibilityIdentifier = @"ChatRoom list";
     [self loadData];
 }
 
diff --git a/Classes/ContactDetailsTableViewController.h b/Classes/ContactDetailsTableViewController.h
index d4ed1da3e..c51db7bab 100644
--- a/Classes/ContactDetailsTableViewController.h
+++ b/Classes/ContactDetailsTableViewController.h
@@ -25,6 +25,15 @@
 #import "UIContactDetailsHeader.h"
 #import "UIContactDetailsFooter.h"
 
+
+typedef enum _ContactSections {
+    ContactSections_None = 0,
+    ContactSections_Number,
+    ContactSections_Sip,
+    ContactSections_Email,
+    ContactSections_MAX
+} ContactSections_e;
+
 @interface ContactDetailsTableViewController : UITableViewController<ContactDetailsLabelViewDelegate, UITextFieldDelegate> {
 @private
     NSMutableArray *dataCache;
diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index 9be9e4e48..a85bd9cad 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -55,14 +55,6 @@
 
 @implementation ContactDetailsTableViewController
 
-typedef enum _ContactSections {
-    ContactSections_None = 0,
-    ContactSections_Number,
-    ContactSections_Sip,
-    ContactSections_Email,
-    ContactSections_MAX
-} ContactSections_e;
-
 static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSections_None, ContactSections_Number, ContactSections_Sip, ContactSections_Email};
 
 @synthesize footerController;
@@ -124,6 +116,8 @@ static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSe
     [super viewDidLoad];
     [headerController view]; // Force view load
     [footerController view]; // Force view load
+    
+    self.tableView.accessibilityIdentifier = @"Contact numbers table";
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m
index e100d3fe6..35f010ae3 100644
--- a/Classes/ContactDetailsViewController.m
+++ b/Classes/ContactDetailsViewController.m
@@ -225,7 +225,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
     } else {
         [editButton setHidden:TRUE];
     }
-    }   
+}
 
 #pragma mark - UICompositeViewDelegate Functions
 
diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m
index ddfce78ba..79675a18d 100644
--- a/Classes/ContactsTableViewController.m
+++ b/Classes/ContactsTableViewController.m
@@ -176,11 +176,12 @@ static int ms_strcmpfuz(const char * fuzzy_word, const char * sentence) {
 					if ([ContactSelection getNameOrEmailFilter] == nil ||
 						(ms_strcmpfuz([[[ContactSelection getNameOrEmailFilter] lowercaseString] UTF8String], [[name lowercaseString] UTF8String]) == 0)) {
 
-						//Get first char. However translate them to ASCII first, because foreign languages (spanish) use tildes for instance
-						NSString *firstCharUTF8 = [[name substringToIndex:1] uppercaseString];
-						NSData *data = [firstCharUTF8 dataUsingEncoding:NSASCIIStringEncoding
-													 allowLossyConversion:YES];
-						NSString *firstChar = [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autorelease];
+						//Sort contacts by first letter. We need to translate the name to ASCII first, because of UTF-8 issues. For instance
+						// we expect order:  Alberta(A tilde) before ASylvano.
+						NSData *name2ASCIIdata = [name dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
+						NSString *name2ASCII = [[[NSString alloc] initWithData:name2ASCIIdata encoding:NSASCIIStringEncoding] autorelease];
+						NSString *firstChar = [[name2ASCII substringToIndex:1] uppercaseString];
+
 						// Put in correct subDic
 						if([firstChar characterAtIndex:0] < 'A' || [firstChar characterAtIndex:0] > 'Z') {
 							firstChar = @"#";
@@ -190,7 +191,7 @@ static int ms_strcmpfuz(const char * fuzzy_word, const char * sentence) {
 							subDic = [[[OrderedDictionary alloc] init] autorelease];
 							[addressBookMap insertObject:subDic forKey:firstChar selector:@selector(caseInsensitiveCompare:)];
 						}
-						[subDic insertObject:lPerson forKey:name selector:@selector(caseInsensitiveCompare:)];
+						[subDic insertObject:lPerson forKey:name2ASCII selector:@selector(caseInsensitiveCompare:)];
 					}
 				}
 				if(lLocalizedlOrganization != nil)
diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h
index 49e6d857c..d97d612df 100644
--- a/Classes/DialerViewController.h
+++ b/Classes/DialerViewController.h
@@ -27,7 +27,7 @@
 #import "UITransferButton.h"
 #import "UIDigitButton.h"
 
-@interface DialerViewController : UIViewController <UITextFieldDelegate, UICompositeViewDelegate> {
+@interface DialerViewController : UIViewController <UITextFieldDelegate, UICompositeViewDelegate, MFMailComposeViewControllerDelegate> {
 }
 
 - (void)setAddress:(NSString*)address;
diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m
index 652e42947..c9480b922 100644
--- a/Classes/DialerViewController.m
+++ b/Classes/DialerViewController.m
@@ -22,6 +22,7 @@
 
 #import "DialerViewController.h"
 #import "IncallViewController.h"
+#import "DTAlertView.h"
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
 #import "Utils.h"
@@ -276,6 +277,89 @@ static UICompositeViewDescription *compositeDescription = nil;
     }
 }
 
+#pragma mark - Debug Functions
+-(void)presentMailViewWithTitle:(NSString*)subject forRecipients:(NSArray*)recipients attachLogs:(BOOL)attachLogs {
+	if( [MFMailComposeViewController canSendMail] ){
+		MFMailComposeViewController* controller = [[MFMailComposeViewController alloc] init];
+		if( controller ){
+			controller.mailComposeDelegate = self;
+			[controller setSubject:subject];
+			[controller setToRecipients:recipients];
+
+			if( attachLogs ){
+				char * filepath = linphone_core_compress_log_collection([LinphoneManager getLc]);
+				if (filepath == NULL) {
+					Linphone_err(@"Cannot sent logs: file is NULL");
+					return;
+				}
+				NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
+				NSString *filename = [appName stringByAppendingString:@".gz"];
+				NSString *mimeType = @"text/plain";
+
+				if ([filename hasSuffix:@".gz"]) {
+					mimeType = @"application/gzip";
+					filename = [appName stringByAppendingString:@".gz"];
+				} else {
+					Linphone_err(@"Unknown extension type: %@, cancelling email", filename);
+					return;
+				}
+				[controller setMessageBody:NSLocalizedString(@"Application logs", nil) isHTML:NO];
+				[controller addAttachmentData:[NSData dataWithContentsOfFile:[NSString stringWithUTF8String:filepath]] mimeType:mimeType fileName:filename];
+
+				ms_free(filepath);
+
+			}
+			self.modalPresentationStyle = UIModalPresentationPageSheet;
+			[self.view.window.rootViewController presentViewController:controller animated:TRUE completion:^{}];
+			[controller release];
+		}
+
+	} else {
+		UIAlertView* alert = [[UIAlertView alloc] initWithTitle:subject
+														message:NSLocalizedString(@"Error: no mail account configured", nil)
+													   delegate:nil
+											  cancelButtonTitle:NSLocalizedString(@"OK", nil)
+											  otherButtonTitles: nil];
+		[alert show];
+		[alert release];
+	}
+}
+
+
+- (BOOL)displayDebugPopup:(NSString*)address {
+	LinphoneManager* mgr = [LinphoneManager instance];
+	NSString* debugAddress = [mgr lpConfigStringForKey:@"debug_popup_magic" withDefault:@""];
+	if( ![debugAddress isEqualToString:@""] && [address isEqualToString:debugAddress]){
+
+
+		DTAlertView* alertView = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"Debug", nil)
+															message:NSLocalizedString(@"Choose an action", nil)];
+
+		[alertView addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil) block:nil];
+
+		[alertView addButtonWithTitle:NSLocalizedString(@"Send logs", nil) block:^{
+			NSString* appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
+			NSString* logsAddress = [mgr lpConfigStringForKey:@"debug_popup_email" withDefault:@"linphone-ios@linphone.org"];
+			[self presentMailViewWithTitle:appName forRecipients:@[logsAddress] attachLogs:true];
+		}];
+
+		BOOL debugEnabled   = [[LinphoneManager instance] lpConfigBoolForKey:@"debugenable_preference"];
+		NSString* actionLog = (debugEnabled ? NSLocalizedString(@"Disable logs", nil) : NSLocalizedString(@"Enable logs", nil));
+		[alertView addButtonWithTitle:actionLog block:^{
+			// enable / disable
+			BOOL enableDebug = ![mgr lpConfigBoolForKey:@"debugenable_preference"];
+			[mgr lpConfigSetBool:enableDebug forKey:@"debugenable_preference"];
+			[mgr setLogsEnabled:enableDebug];
+		}];
+
+		[alertView show];
+		[alertView release];
+		return true;
+	}
+	return false;
+}
+
+
 #pragma mark -
 
 - (void)callUpdate:(LinphoneCall*)call state:(LinphoneCallState)state {
@@ -339,6 +423,13 @@ static UICompositeViewDescription *compositeDescription = nil;
     return YES;
 }
 
+#pragma mark - MFComposeMailDelegate
+
+-(void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
+	[controller dismissViewControllerAnimated:TRUE completion:^{}];
+	[self.navigationController setNavigationBarHidden:TRUE animated:FALSE];
+}
+
 
 #pragma mark - Action Functions
 
@@ -359,6 +450,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onAddressChange: (id)sender {
+	if( [self displayDebugPopup:self.addressField.text] ){
+		self.addressField.text = @"";
+	}
     if([[addressField text] length] > 0) {
         [addContactButton setEnabled:TRUE];
         [eraseButton setEnabled:TRUE];
diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index abd8a3e2e..cfd5cf754 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -190,7 +190,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 															,linphone_proxy_config_get_domain(proxyCfg));
 		linphone_core_add_auth_info([LinphoneManager getLc], auth_info);
 		linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
-		linphone_core_set_default_proxy([LinphoneManager getLc], proxyCfg);
+		linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
 		[self.waitView setHidden:false];
 	};
 }
diff --git a/Classes/KIF b/Classes/KIF
new file mode 160000
index 000000000..6a21291a3
--- /dev/null
+++ b/Classes/KIF
@@ -0,0 +1 @@
+Subproject commit 6a21291a3b6653304be63eeaca8a0edfeb01d7c6
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index 8f9d523d3..950bcb362 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -172,24 +172,29 @@
 
     UIApplication* app= [UIApplication sharedApplication];
     UIApplicationState state = app.applicationState;
-    
-    if( [app respondsToSelector:@selector(registerUserNotificationSettings:)] ){
-        /* iOS8 notifications can be actioned! Awesome: */
-        UIUserNotificationType notifTypes = UIUserNotificationTypeBadge|UIUserNotificationTypeSound|UIUserNotificationTypeAlert;
-       
-        NSSet* categories = [NSSet setWithObjects:[self getCallNotificationCategory], [self getMessageNotificationCategory], nil];
-        UIUserNotificationSettings* userSettings = [UIUserNotificationSettings settingsForTypes:notifTypes categories:categories];
-        [app registerUserNotificationSettings:userSettings];
-        [app registerForRemoteNotifications];
-    } else {
-        NSUInteger notifTypes = UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound|UIRemoteNotificationTypeBadge|UIRemoteNotificationTypeNewsstandContentAvailability;
-        [app registerForRemoteNotificationTypes:notifTypes];
-    }
 
 	LinphoneManager* instance = [LinphoneManager instance];
     BOOL background_mode = [instance lpConfigBoolForKey:@"backgroundmode_preference"];
     BOOL start_at_boot   = [instance lpConfigBoolForKey:@"start_at_boot_preference"];
-
+    
+    
+    if( !instance.isTesting ){
+        if( [app respondsToSelector:@selector(registerUserNotificationSettings:)] ){
+            /* iOS8 notifications can be actioned! Awesome: */
+            UIUserNotificationType notifTypes = UIUserNotificationTypeBadge|UIUserNotificationTypeSound|UIUserNotificationTypeAlert;
+            
+            NSSet* categories = [NSSet setWithObjects:[self getCallNotificationCategory], [self getMessageNotificationCategory], nil];
+            UIUserNotificationSettings* userSettings = [UIUserNotificationSettings settingsForTypes:notifTypes categories:categories];
+            [app registerUserNotificationSettings:userSettings];
+            [app registerForRemoteNotifications];
+        } else {
+            NSUInteger notifTypes = UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound|UIRemoteNotificationTypeBadge|UIRemoteNotificationTypeNewsstandContentAvailability;
+            [app registerForRemoteNotificationTypes:notifTypes];
+        }
+    } else {
+        NSLog(@"No remote push for testing");
+    }
+    
 
     if (state == UIApplicationStateBackground)
     {
@@ -342,13 +347,13 @@
         {
             [[LinphoneManager instance] acceptCallForCallId:[notification.userInfo objectForKey:@"callId"]];
         }
-    } else if([notification.userInfo objectForKey:@"from"] != nil) {
-        NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"from"];
+    } else if([notification.userInfo objectForKey:@"from_addr"] != nil) {
+        NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"from_addr"];
         // Go to ChatRoom view
         [[PhoneMainView instance] changeCurrentView:[ChatViewController compositeViewDescription]];
+		LinphoneChatRoom*room = [self findChatRoomForContact:remoteContact];
         ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController);
-        if(controller != nil) {
-            LinphoneChatRoom*room = [self findChatRoomForContact:remoteContact];
+        if(controller != nil && room != nil) {
             [controller setChatRoom:room];
         }
     } else if([notification.userInfo objectForKey:@"callLog"] != nil) {
@@ -423,7 +428,7 @@
                 // use the standard handler
                 [self application:application didReceiveLocalNotification:notification];
             } else if( [identifier isEqualToString:@"mark_read"] ){
-                NSString* from = [notification.userInfo objectForKey:@"from"];
+                NSString* from = [notification.userInfo objectForKey:@"from_addr"];
                 LinphoneChatRoom* room = linphone_core_get_or_create_chat_room(lc, [from UTF8String]);
                 if( room ){
                     linphone_chat_room_mark_as_read(room);
@@ -472,7 +477,6 @@
                                               otherButtonTitles:nil];
         [error show];
         [error release];
-        
     }
 }
 
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 2327a34d0..16c3289ee 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -200,7 +200,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		switch(menc){
 			case LinphoneMediaEncryptionSRTP: val="SRTP"; break;
 			case LinphoneMediaEncryptionZRTP: val="ZRTP"; break;
-			default:                          val="None"; break;
+			case LinphoneMediaEncryptionDTLS: val="DTLS"; break;
+			case LinphoneMediaEncryptionNone: val="None"; break;
 		}
 		[self setString:val forKey:@"media_encryption_preference"];
 	}
@@ -438,7 +439,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		} else {
 			// was a new proxy config, add it
 			linphone_core_add_proxy_config(lc, proxyCfg);
-			linphone_core_set_default_proxy(lc,proxyCfg);
+			linphone_core_set_default_proxy_config(lc,proxyCfg);
 		}
 
 	bad_proxy:
@@ -573,6 +574,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionSRTP);
 	else if (menc && [menc compare:@"ZRTP"] == NSOrderedSame)
 		linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionZRTP);
+	else if (menc && [menc compare:@"DTLS"] == NSOrderedSame)
+		linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionDTLS);
 	else
 		linphone_core_set_media_encryption(lc, LinphoneMediaEncryptionNone);
 
diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h
index 99adcdb7d..daa3c4779 100644
--- a/Classes/LinphoneManager.h
+++ b/Classes/LinphoneManager.h
@@ -157,6 +157,7 @@ typedef struct _LinphoneManagerSounds {
 + (BOOL)copyFile:(NSString*)src destination:(NSString*)dst override:(BOOL)override;
 + (NSString*)bundleFile:(NSString*)file;
 + (NSString*)documentFile:(NSString*)file;
++ (NSString*)cacheDirectory;
 
 - (void)acceptCall:(LinphoneCall *)call;
 - (void)call:(NSString *)address displayName:(NSString*)displayName transfer:(BOOL)transfer;
@@ -180,6 +181,7 @@ typedef struct _LinphoneManagerSounds {
 - (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString*)section;
 - (void)silentPushFailed:(NSTimer*)timer;
 
+@property (readonly) BOOL isTesting;
 @property (readonly) FastAddressBook* fastAddressBook;
 @property Connectivity connectivity;
 @property (readonly) NetworkType network;
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 3a08d0683..2f5606027 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -28,6 +28,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 #import <CoreTelephony/CTCallCenter.h>
 #import <SystemConfiguration/CaptiveNetwork.h>
+#import <CoreTelephony/CTTelephonyNetworkInfo.h>
 
 #import "LinphoneManager.h"
 #import "LinphoneCoreSettingsStore.h"
@@ -200,6 +201,12 @@ struct codec_name_pref_table codec_pref_table[]={
 #endif
 }
 
++ (BOOL)isRunningTests {
+    NSDictionary *environment = [[NSProcessInfo processInfo] environment];
+    NSString *injectBundle = environment[@"XCInjectBundle"];
+    return [[injectBundle pathExtension] isEqualToString:@"xctest"];
+}
+
 + (BOOL)isNotIphone3G
 {
 	static BOOL done=FALSE;
@@ -278,6 +285,7 @@ struct codec_name_pref_table codec_pref_table[]={
 		[self copyDefaultSettings];
 		pushCallIDs = [[NSMutableArray alloc] init ];
 		photoLibrary = [[ALAssetsLibrary alloc] init];
+        self->_isTesting = [LinphoneManager isRunningTests];
 
 		NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"];
 		NSString *confiFileName = [LinphoneManager documentFile:@".linphonerc"];
@@ -315,6 +323,14 @@ struct codec_name_pref_table codec_pref_table[]={
 	[super dealloc];
 }
 
+- (void)silentPushFailed:(NSTimer*)timer
+{
+	if( silentPushCompletion ){
+		[LinphoneLogger log:LinphoneLoggerLog format:@"silentPush failed, silentPushCompletion block: %p", silentPushCompletion ];
+		silentPushCompletion(UIBackgroundFetchResultNoData);
+		silentPushCompletion = nil;
+	}
+}
 
 #pragma mark - Database Functions
 
@@ -569,10 +585,9 @@ static void linphone_iphone_log(struct _LinphoneCore * lc, const char * message)
 
 - (void)displayStatus:(NSString*) message {
 	// Post event
-	NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-						   message, @"message",
-						   nil];
-	[[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneDisplayStatusUpdate object:self userInfo:dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneDisplayStatusUpdate
+                                                        object:self
+                                                      userInfo:@{@"message":message}];
 }
 
 
@@ -772,10 +787,9 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
 		[self setupGSMInteraction];
 	}
 	// Post event
-	NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-						   [NSValue valueWithPointer:call], @"call",
-						   [NSNumber numberWithInt:state], @"state",
-						   [NSString stringWithUTF8String:message], @"message", nil];
+    NSDictionary* dict = @{@"call":   [NSValue valueWithPointer:call],
+                           @"state":  [NSNumber numberWithInt:state],
+                           @"message":[NSString stringWithUTF8String:message]};
 	[[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCallUpdate object:self userInfo:dict];
 }
 
@@ -881,6 +895,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo
     const LinphoneAddress* remoteAddress = linphone_chat_message_get_from_address(msg);
     char* c_address                      = linphone_address_as_string_uri_only(remoteAddress);
     NSString* address                    = [NSString stringWithUTF8String:c_address];
+    NSString* remote_uri                 = [NSString stringWithUTF8String:c_address];
     const char* call_id                  = linphone_chat_message_get_custom_header(msg, "Call-ID");
     NSString* callID                     = [NSString stringWithUTF8String:call_id];
 
@@ -912,7 +927,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo
 			notif.alertBody      = [NSString  stringWithFormat:NSLocalizedString(@"IM_MSG",nil), address];
 			notif.alertAction    = NSLocalizedString(@"Show", nil);
 			notif.soundName      = @"msg.caf";
-			notif.userInfo       = @{@"from":address, @"call-id":callID};
+			notif.userInfo       = @{@"from":address, @"from_addr":remote_uri, @"call-id":callID};
 
 			[[UIApplication sharedApplication] presentLocalNotificationNow:notif];
 		}
@@ -1190,18 +1205,30 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 }
 
 - (NetworkType)network {
-	UIApplication *app = [UIApplication sharedApplication];
-	NSArray *subviews = [[[app valueForKey:@"statusBar"] valueForKey:@"foregroundView"]    subviews];
-	NSNumber *dataNetworkItemView = nil;
+	if( [[[UIDevice currentDevice] systemVersion] floatValue] < 7 ){
+		UIApplication *app = [UIApplication sharedApplication];
+		NSArray *subviews = [[[app valueForKey:@"statusBar"] valueForKey:@"foregroundView"]    subviews];
+		NSNumber *dataNetworkItemView = nil;
 
-	for (id subview in subviews) {
-		if([subview isKindOfClass:[NSClassFromString(@"UIStatusBarDataNetworkItemView") class]]) {
-			dataNetworkItemView = subview;
-			break;
+		for (id subview in subviews) {
+			if([subview isKindOfClass:[NSClassFromString(@"UIStatusBarDataNetworkItemView") class]]) {
+				dataNetworkItemView = subview;
+				break;
+			}
 		}
+
+		NSNumber *number = (NSNumber*)[dataNetworkItemView valueForKey:@"dataNetworkType"];
+		return [number intValue];
+	} else {
+		CTTelephonyNetworkInfo* info = [[CTTelephonyNetworkInfo alloc] init];
+		NSString* currentRadio = info.currentRadioAccessTechnology;
+		if( [currentRadio isEqualToString:CTRadioAccessTechnologyEdge]){
+			return network_2g;
+		} else if ([currentRadio isEqualToString:CTRadioAccessTechnologyLTE]){
+			return network_4g;
+		}
+		return network_3g;
 	}
-	NSNumber *number = (NSNumber*)[dataNetworkItemView valueForKey:@"dataNetworkType"];
-	return [number intValue];
 }
 
 
@@ -1432,14 +1459,8 @@ static BOOL libStarted = FALSE;
     libmsbcg729_init(); // load g729 plugin
 #endif
 
-    /*to make sure we don't loose debug trace*/
-    if ([self lpConfigBoolForKey:@"debugenable_preference"]) {
-        linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
-        ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
-		/*must be done before creating linphone core to get its traces too*/
-    }
 	linphone_core_set_log_collection_path([[LinphoneManager cacheDirectory] UTF8String]);
-	linphone_core_enable_log_collection([self lpConfigBoolForKey:@"debugenable_preference"]);
+	[self setLogsEnabled:[self lpConfigBoolForKey:@"debugenable_preference"]];
 
 
 	theLinphoneCore = linphone_core_new_with_config (&linphonec_vtable
@@ -1451,7 +1472,8 @@ static BOOL libStarted = FALSE;
 	/* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */
 	const char* lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
 	linphone_core_set_root_ca(theLinphoneCore, lRootCa);
-
+	linphone_core_set_user_certificates_path(theLinphoneCore,[[LinphoneManager cacheDirectory] UTF8String]);
+	
 	/* The core will call the linphone_iphone_configuring_status_changed callback when the remote provisioning is loaded (or skipped).
 	 Wait for this to finish the code configuration */
 
@@ -2052,10 +2074,12 @@ static void audioRouteChangeListenerCallback (
 
 -(void)setLogsEnabled:(BOOL)enabled {
 	if (enabled) {
+		NSLog(@"Enabling debug logs");
 		linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
 		ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
 		linphone_core_enable_log_collection(enabled);
 	} else {
+		NSLog(@"Disabling debug logs");
 		linphone_core_enable_log_collection(enabled);
 		linphone_core_disable_logs();
 	}
@@ -2151,17 +2175,8 @@ static void audioRouteChangeListenerCallback (
 - (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString *)section {
 	return [self lpConfigIntForKey:key forSection:section] == 1;
 }
-- (void)silentPushFailed:(NSTimer*)timer
-{
-	if( silentPushCompletion ){
-		[LinphoneLogger log:LinphoneLoggerLog format:@"silentPush failed, silentPushCompletion block: %p", silentPushCompletion ];
-		silentPushCompletion(UIBackgroundFetchResultNoData);
-		silentPushCompletion = nil;
-	}
-}
 
-
-#pragma GSM management
+#pragma mark - GSM management
 
 -(void) removeCTCallCenterCb {
 	if (mCallCenter != nil) {
diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.strings b/Classes/LinphoneUI/Base.lproj/UICallCell.strings
index 92138347c..9d9551217 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UICallCell.strings and b/Classes/LinphoneUI/Base.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.xib b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
index fc7757b12..c46edde08 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
@@ -59,7 +59,7 @@
                                     <rect key="frame" x="80" y="0.0" width="160" height="170"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                         <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
                                         <bool key="isElement" value="YES"/>
                                     </accessibility>
@@ -364,7 +364,7 @@
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="17" userLabel="addressLabel">
                             <rect key="frame" x="95" y="0.0" width="125" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name">
+                            <accessibility key="accessibilityConfiguration" label="Contact name">
                                 <accessibilityTraits key="traits" none="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings
index 9ca9f1ae8..91f270f45 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
index 28099191d..e4a9593a5 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatRoomCell.xib
@@ -45,6 +45,7 @@
                                     <rect key="frame" x="-8" y="-11" width="310" height="126"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    <accessibility key="accessibilityConfiguration" label="Chat Message"/>
                                     <color key="textColor" red="0.35686275360000003" green="0.3960784376" blue="0.43529412150000002" alpha="1" colorSpace="deviceRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -79,10 +80,14 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="chat_message_not_delivered.png" id="26" userLabel="status">
                             <rect key="frame" x="284" y="104" width="10" height="10"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Message status">
+                                <bool key="isElement" value="YES"/>
+                            </accessibility>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="18" userLabel="deleteButton">
                             <rect key="frame" x="250" y="0.0" width="44" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Delete message"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                             <inset key="imageEdgeInsets" minX="20" minY="2" maxX="2" maxY="20"/>
                             <state key="normal" image="list_delete_default.png">
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings
index 9da4ee791..55ec8b262 100644
Binary files a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
index 97ae47c35..f4934c521 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactDetailsHeader.xib
@@ -31,7 +31,7 @@
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="22" userLabel="avatarButton">
                     <rect key="frame" x="20" y="6" width="65" height="65"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="Contact's avatar">
+                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
                         <accessibilityTraits key="traits" none="YES"/>
                     </accessibility>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
@@ -53,7 +53,7 @@
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8" userLabel="addressLabel">
                             <rect key="frame" x="0.0" y="37" width="199" height="43"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Contact's name"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact name"/>
                             <fontDescription key="fontDescription" type="system" pointSize="22"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
index 95e601db9..fc8405d9b 100644
--- a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIMainBar">
@@ -141,7 +141,7 @@
                         <action selector="onChatClick:" destination="-1" eventType="touchUpInside" id="26"/>
                     </connections>
                 </button>
-                <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="37" userLabel="chatNotificationView">
+                <view autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="37" userLabel="chatNotificationView">
                     <rect key="frame" x="235" y="0.0" width="21" height="21"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="history_notification.png" translatesAutoresizingMaskIntoConstraints="NO" id="39" userLabel="chatNotificationImage">
diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.xib
index 2e4644731..2e6fdeb96 100644
--- a/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIMainBar~ipad.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIMainBar">
@@ -51,7 +51,7 @@
                         <action selector="onHistoryClick:" destination="-1" eventType="touchUpInside" id="58"/>
                     </connections>
                 </button>
-                <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" id="4" userLabel="historyNotificationView">
+                <view autoresizesSubviews="NO" userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" id="4" userLabel="historyNotificationView">
                     <rect key="frame" x="144" y="1" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
@@ -146,8 +146,8 @@
                         <action selector="onChatClick:" destination="-1" eventType="touchUpInside" id="56"/>
                     </connections>
                 </button>
-                <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="3" userLabel="chatNotificationView">
-                    <rect key="frame" x="428" y="1" width="21" height="21"/>
+                <view autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="3" userLabel="chatNotificationView">
+                    <rect key="frame" x="564" y="1" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="history_notification.png" id="13" userLabel="chatNotificationImage">
@@ -169,6 +169,8 @@
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.0" green="1" blue="0.19194547549999999" alpha="0.0" colorSpace="calibratedRGB"/>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
         </view>
         <view autoresizesSubviews="NO" contentMode="scaleToFill" id="28" userLabel="Landscape View">
             <rect key="frame" x="0.0" y="0.0" width="1024" height="86"/>
@@ -196,7 +198,7 @@
                         <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
                     </state>
                 </button>
-                <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" id="36" userLabel="historyNotificationView">
+                <view autoresizesSubviews="NO" userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" id="36" userLabel="historyNotificationView">
                     <rect key="frame" x="209" y="1" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
@@ -276,8 +278,8 @@
                         <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
                     </state>
                 </button>
-                <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="29" userLabel="chatNotificationView">
-                    <rect key="frame" x="558" y="1" width="21" height="21"/>
+                <view autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="29" userLabel="chatNotificationView">
+                    <rect key="frame" x="755" y="8" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="history_notification.png" id="40" userLabel="chatNotificationImage">
@@ -296,6 +298,8 @@
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.0" green="1" blue="0.19194547549999999" alpha="0.0" colorSpace="calibratedRGB"/>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
         </view>
     </objects>
     <resources>
@@ -328,4 +332,9 @@
         <image name="settings_selected.png" width="353" height="153"/>
         <image name="settings_selected_landscape.png" width="480" height="171"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index 2686ce099..2ffa9a7e2 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -197,17 +197,21 @@ static UIFont *CELL_FONT = nil;
     [dateFormatter release];
 
     LinphoneChatMessageState state = linphone_chat_message_get_state(chat);
+    BOOL outgoing = linphone_chat_message_is_outgoing(chat);
 
-    if( !linphone_chat_message_is_outgoing(chat) ){
+    if( !outgoing ){
         statusImage.hidden = TRUE; // not useful for incoming chats..
     } else if (state== LinphoneChatMessageStateInProgress) {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_inprogress.png"]];
+        [statusImage setAccessibilityValue:@"in progress"];
 		statusImage.hidden = FALSE;
 	} else if (state == LinphoneChatMessageStateDelivered) {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_delivered.png"]];
+        [statusImage setAccessibilityValue:@"delivered"];
 		statusImage.hidden = FALSE;
 	} else {
 		[statusImage setImage:[UIImage imageNamed:@"chat_message_not_delivered.png"]];
+        [statusImage setAccessibilityValue:@"not delivered"];
 		statusImage.hidden = FALSE;
 
         NSAttributedString* resend_text = [[NSAttributedString alloc]
@@ -216,6 +220,13 @@ static UIFont *CELL_FONT = nil;
         [dateLabel setAttributedText:resend_text];
         [resend_text release];
 	}
+    
+    if( outgoing){
+        [messageText setAccessibilityLabel:@"Outgoing message"];
+    } else {
+        [messageText setAccessibilityLabel:@"Incoming message"];
+    }
+    
 }
 
 - (void)setEditing:(BOOL)editing {
diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m
index 06c28d2bf..5f3c595de 100644
--- a/Classes/LinphoneUI/UIContactCell.m
+++ b/Classes/LinphoneUI/UIContactCell.m
@@ -70,7 +70,7 @@
     [self setHighlighted:false animated:true];
 }
 
-- (NSString *)accessibilityValue {
+- (NSString *)accessibilityLabel {
     return [NSString stringWithFormat:@"%@ %@", firstNameLabel.text, lastNameLabel.text];
 }
 
diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m
index f3787a4f8..376006b15 100644
--- a/Classes/LinphoneUI/UIContactDetailsHeader.m
+++ b/Classes/LinphoneUI/UIContactDetailsHeader.m
@@ -94,6 +94,7 @@
     [normalView setAlpha:1.0f];
     [editView setAlpha:0.0f];
     [tableView setEditing:TRUE animated:false];
+    tableView.accessibilityIdentifier = @"Contact Name Table";
 }
 
 
diff --git a/Classes/LinphoneUI/ar.lproj/UICallCell.strings b/Classes/LinphoneUI/ar.lproj/UICallCell.strings
index 1ddefac3e..5867d40e5 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UICallCell.strings and b/Classes/LinphoneUI/ar.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings
index 268a5488f..77b8494d0 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/ar.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings
index 17004dd72..bd8aa1e2b 100644
Binary files a/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ar.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UICallCell.strings b/Classes/LinphoneUI/de.lproj/UICallCell.strings
index 1747f9328..114e59720 100644
Binary files a/Classes/LinphoneUI/de.lproj/UICallCell.strings and b/Classes/LinphoneUI/de.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings
index e7201be63..9c4254d7b 100644
Binary files a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings
index 790695a1c..2d8554414 100644
Binary files a/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UICallCell.strings b/Classes/LinphoneUI/fr.lproj/UICallCell.strings
index dd352ca36..94dbc6b13 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UICallCell.strings and b/Classes/LinphoneUI/fr.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings
index a54d1be29..35daf8f29 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/fr.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings
index b85ee2376..6c1d42070 100644
Binary files a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UICallCell.strings b/Classes/LinphoneUI/ja.lproj/UICallCell.strings
index 70769c2ce..1d9525a61 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UICallCell.strings and b/Classes/LinphoneUI/ja.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings
index bf9c680d6..317551c24 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings and b/Classes/LinphoneUI/ja.lproj/UIChatRoomCell.strings differ
diff --git a/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings
index bd3e929d9..101df1338 100644
Binary files a/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ja.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/ru.lproj/UICallCell.strings b/Classes/LinphoneUI/ru.lproj/UICallCell.strings
index 6fff0fad0..8dad3a8a4 100644
Binary files a/Classes/LinphoneUI/ru.lproj/UICallCell.strings and b/Classes/LinphoneUI/ru.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings
index dc67832a3..793dfe07b 100644
Binary files a/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings and b/Classes/LinphoneUI/ru.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings
new file mode 100644
index 000000000..4b627577c
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallBar.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings
new file mode 100644
index 000000000..7bda03e1b
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallBar~ipad.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings b/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings
new file mode 100644
index 000000000..7fb608a6d
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UICallCell.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings b/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings
new file mode 100644
index 000000000..c16425967
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UIChatCell.strings differ
diff --git a/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings
new file mode 100644
index 000000000..20b1a62e9
Binary files /dev/null and b/Classes/LinphoneUI/zh_TW.lproj/UIContactDetailsHeader.strings differ
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 2d220f2ad..b4c070454 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -325,6 +325,7 @@ static RootViewManager* rootViewManagerInstance = nil;
     
 	switch (state) {					
 		case LinphoneCallIncomingReceived: 
+        case LinphoneCallIncomingEarlyMedia:
         {
 			[self displayIncomingCall:call];
 			break;
@@ -407,15 +408,17 @@ static RootViewManager* rootViewManagerInstance = nil;
     LinphoneCore* core = nil;
     @try {
         core = [LinphoneManager getLc];
+        LinphoneManager* lm = [LinphoneManager instance];
         if( linphone_core_get_global_state(core) != LinphoneGlobalOn ){
             [self changeCurrentView: [DialerViewController compositeViewDescription]];
         } else if ([[LinphoneManager instance] lpConfigBoolForKey:@"enable_first_login_view_preference"]  == true) {
             // Change to fist login view
             [self changeCurrentView: [FirstLoginViewController compositeViewDescription]];
         } else {
+            // always start to dialer when testing
             // Change to default view
             const MSList *list = linphone_core_get_proxy_config_list(core);
-            if(list != NULL || ([[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_preference"]  == true)) {
+            if(list != NULL || ([lm lpConfigBoolForKey:@"hide_wizard_preference"]  == true) || lm.isTesting) {
                 [self changeCurrentView: [DialerViewController compositeViewDescription]];
             } else {
                 WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index e1a53e5ee..909a8fb39 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -32,6 +32,8 @@
 #import "IASKTextField.h"
 #include "linphone/lpconfig.h"
 
+#import "DTAlertView.h"
+
 #ifdef DEBUG
 @interface UIDevice (debug)
 
@@ -562,6 +564,14 @@ static UICompositeViewDescription *compositeDescription = nil;
             [values removeObject:@"SRTP"];
             [dict setObject:values forKey:@"Values"];
         }
+		if(!linphone_core_media_encryption_supported([LinphoneManager getLc], LinphoneMediaEncryptionDTLS)) {
+			NSMutableArray *titles = [NSMutableArray arrayWithArray:[dict objectForKey:@"Titles"]];
+			[titles removeObject:@"DTLS"];
+			[dict setObject:titles forKey:@"Titles"];
+			NSMutableArray *values = [NSMutableArray arrayWithArray:[dict objectForKey:@"Values"]];
+			[values removeObject:@"DTLS"];
+			[dict setObject:values forKey:@"Values"];
+		}
         return [[[IASKSpecifier alloc] initWithSpecifier:dict] autorelease];
     }
 
@@ -686,6 +696,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)settingsViewController:(IASKAppSettingsViewController*)sender buttonTappedForSpecifier:(IASKSpecifier*)specifier {
     NSString *key = [specifier.specifierDict objectForKey:kIASKKey];
+	LinphoneCore* lc = [LinphoneManager getLc];
 #ifdef DEBUG
     if([key isEqual:@"release_button"]) {
         [UIApplication sharedApplication].keyWindow.rootViewController = nil;
@@ -701,9 +712,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     }
 #endif
     if([key isEqual:@"wizard_button"]) {
-		LinphoneProxyConfig* proxy = NULL;
-		linphone_core_get_default_proxy([LinphoneManager getLc], &proxy);
-		if (proxy == NULL ) {
+		if (linphone_core_get_default_proxy_config(lc) == NULL ) {
 			[self goToWizard];
 			return;
 		}
@@ -714,12 +723,30 @@ static UICompositeViewDescription *compositeDescription = nil;
                                               otherButtonTitles:NSLocalizedString(@"Launch Wizard",nil), nil];
         [alert show];
         [alert release];
-    } else if([key isEqual:@"about_button"]) {
+	} else if ( [key isEqual:@"clear_proxy_button"] ) {
+		if ( linphone_core_get_default_proxy_config(lc) == NULL ) {
+			return;
+		}
+
+		DTAlertView* alert = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"Warning", nil) message:NSLocalizedString(@"Are you sure to want to clear your proxy setup?",nil)];
+
+		[alert addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil) block:nil];
+		[alert addButtonWithTitle:NSLocalizedString(@"Yes", nil)
+							block:^{
+								linphone_core_clear_proxy_config(lc);
+								linphone_core_clear_all_auth_info(lc);
+								[settingsStore transformLinphoneCoreToKeys];
+								[settingsController.tableView reloadData];
+							}];
+		[alert show];
+		[alert release];
+
+	} else if([key isEqual:@"about_button"]) {
         [[PhoneMainView instance] changeCurrentView:[AboutViewController compositeViewDescription] push:TRUE];
 	} else if ([key isEqualToString:@"reset_logs_button"]) {
 		linphone_core_reset_log_collection();
 	} else if ([key isEqual:@"send_logs_button"]) {
-		char * filepath = linphone_core_compress_log_collection([LinphoneManager getLc]);
+		char * filepath = linphone_core_compress_log_collection(lc);
 		if (filepath == NULL) {
 			[LinphoneLogger log:LinphoneLoggerError format:@"Cannot sent logs: file is NULL"];
 			return;
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index 47e5a5b05..c876a277b 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -210,7 +210,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
                         [addressBookMap setObject:lPerson forKey:lNormalizedKey];
                         CFRelease(lValue);
                         if (lLabel) CFRelease(lLabel);
-                        if (lLocalizedLabel) CFRelease(lLocalizedLabel);                    }
+                        if (lLocalizedLabel) CFRelease(lLocalizedLabel);
+                    }
                     CFRelease(lMap);
                 }
             }
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 82cc40592..69110d042 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -514,7 +514,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     linphone_proxy_config_enable_register(proxyCfg, true);
 	linphone_core_add_auth_info([LinphoneManager getLc], info);
     linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
-	linphone_core_set_default_proxy([LinphoneManager getLc], proxyCfg);
+	linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
 }
 
 - (NSString*)identityFromUsername:(NSString*)username {
diff --git a/Classes/ar.lproj/ChatRoomViewController.strings b/Classes/ar.lproj/ChatRoomViewController.strings
index 4aa68bd62..c54b6c10d 100644
Binary files a/Classes/ar.lproj/ChatRoomViewController.strings and b/Classes/ar.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ar.lproj/HistoryDetailsViewController.strings b/Classes/ar.lproj/HistoryDetailsViewController.strings
index ef989cd93..1398242f7 100644
Binary files a/Classes/ar.lproj/HistoryDetailsViewController.strings and b/Classes/ar.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ar.lproj/IncomingCallViewController.strings b/Classes/ar.lproj/IncomingCallViewController.strings
index 07226ba9d..d90c464f6 100644
Binary files a/Classes/ar.lproj/IncomingCallViewController.strings and b/Classes/ar.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ar.lproj/IncomingCallViewController~ipad.strings b/Classes/ar.lproj/IncomingCallViewController~ipad.strings
index 755032cab..123065a5d 100644
Binary files a/Classes/ar.lproj/IncomingCallViewController~ipad.strings and b/Classes/ar.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ar.lproj/WizardViews.strings b/Classes/ar.lproj/WizardViews.strings
index 5077a9fc8..743a14dfd 100644
Binary files a/Classes/ar.lproj/WizardViews.strings and b/Classes/ar.lproj/WizardViews.strings differ
diff --git a/Classes/de.lproj/ChatRoomViewController.strings b/Classes/de.lproj/ChatRoomViewController.strings
index 2756503dc..b116222de 100644
Binary files a/Classes/de.lproj/ChatRoomViewController.strings and b/Classes/de.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/de.lproj/HistoryDetailsViewController.strings b/Classes/de.lproj/HistoryDetailsViewController.strings
index f47924f05..fe90e3995 100644
Binary files a/Classes/de.lproj/HistoryDetailsViewController.strings and b/Classes/de.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/de.lproj/IncomingCallViewController.strings b/Classes/de.lproj/IncomingCallViewController.strings
index 6c230b92f..6d9f4da81 100644
Binary files a/Classes/de.lproj/IncomingCallViewController.strings and b/Classes/de.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/de.lproj/IncomingCallViewController~ipad.strings b/Classes/de.lproj/IncomingCallViewController~ipad.strings
index 2af2d6c37..951ad9721 100644
Binary files a/Classes/de.lproj/IncomingCallViewController~ipad.strings and b/Classes/de.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/de.lproj/WizardViews.strings b/Classes/de.lproj/WizardViews.strings
index cc90ca31a..4ff99898a 100644
Binary files a/Classes/de.lproj/WizardViews.strings and b/Classes/de.lproj/WizardViews.strings differ
diff --git a/Classes/fr.lproj/ChatRoomViewController.strings b/Classes/fr.lproj/ChatRoomViewController.strings
index 96b177a8b..852063d13 100644
Binary files a/Classes/fr.lproj/ChatRoomViewController.strings and b/Classes/fr.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/fr.lproj/HistoryDetailsViewController.strings b/Classes/fr.lproj/HistoryDetailsViewController.strings
index 517667cf5..d1a6c5589 100644
Binary files a/Classes/fr.lproj/HistoryDetailsViewController.strings and b/Classes/fr.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/fr.lproj/IncomingCallViewController.strings b/Classes/fr.lproj/IncomingCallViewController.strings
index 2559620d9..fd68b1fc5 100644
Binary files a/Classes/fr.lproj/IncomingCallViewController.strings and b/Classes/fr.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/fr.lproj/IncomingCallViewController~ipad.strings b/Classes/fr.lproj/IncomingCallViewController~ipad.strings
index af277919b..bdb7ff117 100644
Binary files a/Classes/fr.lproj/IncomingCallViewController~ipad.strings and b/Classes/fr.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/fr.lproj/WizardViews.strings b/Classes/fr.lproj/WizardViews.strings
index 8759e5071..a8665594e 100644
Binary files a/Classes/fr.lproj/WizardViews.strings and b/Classes/fr.lproj/WizardViews.strings differ
diff --git a/Classes/ja.lproj/ChatRoomViewController.strings b/Classes/ja.lproj/ChatRoomViewController.strings
index 90a808097..221a03340 100644
Binary files a/Classes/ja.lproj/ChatRoomViewController.strings and b/Classes/ja.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ja.lproj/HistoryDetailsViewController.strings b/Classes/ja.lproj/HistoryDetailsViewController.strings
index 621b57ddc..f56503b10 100644
Binary files a/Classes/ja.lproj/HistoryDetailsViewController.strings and b/Classes/ja.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ja.lproj/IncomingCallViewController.strings b/Classes/ja.lproj/IncomingCallViewController.strings
index 3f5f6aeb3..ff9f3ee3c 100644
Binary files a/Classes/ja.lproj/IncomingCallViewController.strings and b/Classes/ja.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ja.lproj/IncomingCallViewController~ipad.strings b/Classes/ja.lproj/IncomingCallViewController~ipad.strings
index 882beb05b..0f32ebaae 100644
Binary files a/Classes/ja.lproj/IncomingCallViewController~ipad.strings and b/Classes/ja.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ja.lproj/WizardViews.strings b/Classes/ja.lproj/WizardViews.strings
index a48859525..eb781b5ef 100644
Binary files a/Classes/ja.lproj/WizardViews.strings and b/Classes/ja.lproj/WizardViews.strings differ
diff --git a/Classes/ru.lproj/ChatRoomViewController.strings b/Classes/ru.lproj/ChatRoomViewController.strings
index 22c828084..48cf472e0 100644
Binary files a/Classes/ru.lproj/ChatRoomViewController.strings and b/Classes/ru.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/ru.lproj/HistoryDetailsViewController.strings b/Classes/ru.lproj/HistoryDetailsViewController.strings
index 4a8846768..fcd2c47c6 100644
Binary files a/Classes/ru.lproj/HistoryDetailsViewController.strings and b/Classes/ru.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/ru.lproj/IncomingCallViewController.strings b/Classes/ru.lproj/IncomingCallViewController.strings
index 23908fb3e..c13b84710 100644
Binary files a/Classes/ru.lproj/IncomingCallViewController.strings and b/Classes/ru.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/ru.lproj/IncomingCallViewController~ipad.strings b/Classes/ru.lproj/IncomingCallViewController~ipad.strings
index 879a6f1dd..8aaca9606 100644
Binary files a/Classes/ru.lproj/IncomingCallViewController~ipad.strings and b/Classes/ru.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/ru.lproj/WizardViews.strings b/Classes/ru.lproj/WizardViews.strings
index 903b5365b..8d2de1a47 100644
Binary files a/Classes/ru.lproj/WizardViews.strings and b/Classes/ru.lproj/WizardViews.strings differ
diff --git a/Classes/zh_TW.lproj/AboutViewController.strings b/Classes/zh_TW.lproj/AboutViewController.strings
new file mode 100644
index 000000000..cacfb5460
Binary files /dev/null and b/Classes/zh_TW.lproj/AboutViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ChatRoomViewController.strings b/Classes/zh_TW.lproj/ChatRoomViewController.strings
new file mode 100644
index 000000000..23f2ad76d
Binary files /dev/null and b/Classes/zh_TW.lproj/ChatRoomViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ChatViewController.strings b/Classes/zh_TW.lproj/ChatViewController.strings
new file mode 100644
index 000000000..9e74e9187
Binary files /dev/null and b/Classes/zh_TW.lproj/ChatViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings b/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings
new file mode 100644
index 000000000..cd678ed1e
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactDetailsLabelViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactDetailsViewController.strings b/Classes/zh_TW.lproj/ContactDetailsViewController.strings
new file mode 100644
index 000000000..5b94a6f7f
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactDetailsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ContactsViewController.strings b/Classes/zh_TW.lproj/ContactsViewController.strings
new file mode 100644
index 000000000..633b2eb51
Binary files /dev/null and b/Classes/zh_TW.lproj/ContactsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/DialerViewController.strings b/Classes/zh_TW.lproj/DialerViewController.strings
new file mode 100644
index 000000000..6af0b616c
Binary files /dev/null and b/Classes/zh_TW.lproj/DialerViewController.strings differ
diff --git a/Classes/zh_TW.lproj/DialerViewController~ipad.strings b/Classes/zh_TW.lproj/DialerViewController~ipad.strings
new file mode 100644
index 000000000..f47328c1d
Binary files /dev/null and b/Classes/zh_TW.lproj/DialerViewController~ipad.strings differ
diff --git a/Classes/zh_TW.lproj/HistoryDetailsViewController.strings b/Classes/zh_TW.lproj/HistoryDetailsViewController.strings
new file mode 100644
index 000000000..d29ff8f24
Binary files /dev/null and b/Classes/zh_TW.lproj/HistoryDetailsViewController.strings differ
diff --git a/Classes/zh_TW.lproj/HistoryViewController.strings b/Classes/zh_TW.lproj/HistoryViewController.strings
new file mode 100644
index 000000000..0367a06c1
Binary files /dev/null and b/Classes/zh_TW.lproj/HistoryViewController.strings differ
diff --git a/Classes/zh_TW.lproj/ImageViewController.strings b/Classes/zh_TW.lproj/ImageViewController.strings
new file mode 100644
index 000000000..907b630ae
Binary files /dev/null and b/Classes/zh_TW.lproj/ImageViewController.strings differ
diff --git a/Classes/zh_TW.lproj/IncomingCallViewController.strings b/Classes/zh_TW.lproj/IncomingCallViewController.strings
new file mode 100644
index 000000000..4771c71db
Binary files /dev/null and b/Classes/zh_TW.lproj/IncomingCallViewController.strings differ
diff --git a/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings b/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings
new file mode 100644
index 000000000..af166daa8
Binary files /dev/null and b/Classes/zh_TW.lproj/IncomingCallViewController~ipad.strings differ
diff --git a/Classes/zh_TW.lproj/WizardViewController.strings b/Classes/zh_TW.lproj/WizardViewController.strings
new file mode 100644
index 000000000..c7cebc6d0
Binary files /dev/null and b/Classes/zh_TW.lproj/WizardViewController.strings differ
diff --git a/Classes/zh_TW.lproj/WizardViewController~ipad.strings b/Classes/zh_TW.lproj/WizardViewController~ipad.strings
new file mode 100644
index 000000000..9e0f0eb25
Binary files /dev/null and b/Classes/zh_TW.lproj/WizardViewController~ipad.strings differ
diff --git a/KifTests/ChatTester.h b/KifTests/ChatTester.h
new file mode 100644
index 000000000..1f6cd2691
--- /dev/null
+++ b/KifTests/ChatTester.h
@@ -0,0 +1,13 @@
+//
+//  ChatTester.h
+//  linphone
+//
+//  Created by Guillaume on 17/01/2015.
+//
+//
+
+#import "LinphoneTestCase.h"
+
+@interface ChatTester : LinphoneTestCase
+
+@end
diff --git a/KifTests/ChatTester.m b/KifTests/ChatTester.m
new file mode 100644
index 000000000..615f095bc
--- /dev/null
+++ b/KifTests/ChatTester.m
@@ -0,0 +1,140 @@
+//
+//  ChatTester.m
+//  linphone
+//
+//  Created by Guillaume on 17/01/2015.
+//
+//
+
+#import "ChatTester.h"
+#include "LinphoneManager.h"
+
+@implementation ChatTester
+
+
+#pragma mark - setup
+
+- (void)beforeAll {
+    [super beforeAll];
+    [self switchToValidAccountIfNeeded];
+    
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Chat")];
+}
+
+#pragma mark - tools
+
+- (void)goBackFromChat {
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Back")];
+}
+
+- (void)startChatWith:(NSString*)user {
+    [tester enterText:user intoViewWithAccessibilityLabel:LOCALIZED(@"Enter a address")];
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"New Discussion")];
+}
+
+- (void)sendMessage:(NSString*)message {
+    [tester enterText:message intoViewWithAccessibilityLabel:LOCALIZED(@"Message field")];
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Send")];
+}
+
+
+#pragma mark - tests
+
+- (void)testSendMessageToMyself {
+    [self startChatWith:[self accountUsername]];
+    
+    [self sendMessage:@"Hello"];
+    
+    [tester waitForViewWithAccessibilityLabel:LOCALIZED(@"Outgoing message") value:@"Hello" traits:UIAccessibilityTraitStaticText];
+    [tester waitForViewWithAccessibilityLabel:LOCALIZED(@"Incoming message") value:@"Hello" traits:UIAccessibilityTraitStaticText];
+    
+    [tester waitForViewWithAccessibilityLabel:LOCALIZED(@"Message status") value:@"delivered" traits:UIAccessibilityTraitImage];
+    
+    [self goBackFromChat];
+}
+
+- (void)testInvalidSPAddress {
+    
+    [self startChatWith:@"sip://toto"];
+    
+    [tester waitForViewWithAccessibilityLabel:LOCALIZED(@"Invalid address") traits:UIAccessibilityTraitStaticText];
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Cancel")];
+}
+
+-(void)testSendToSIPAddress{
+    NSString* sipAddr = [NSString stringWithFormat:@"sip:%@@%@", [self accountUsername], [self accountDomain]];
+    
+    [self startChatWith:sipAddr];
+    
+    [tester waitForViewWithAccessibilityLabel:LOCALIZED(@"Contact name") value:@"testios" traits:0];
+    
+    [self goBackFromChat];
+}
+
+- (void)testChatMessageRemoval {
+    
+    NSString* user = [self getUUID];
+    
+    [self startChatWith:user];
+    [self sendMessage:@"Hello Bro"];
+    
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Edit") traits:UIAccessibilityTraitButton];
+    
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Delete message")];
+    
+    [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Edit") traits:UIAccessibilityTraitButton];
+    
+
+   
+    // check that the tableview is empty
+    UITableView* tv = nil;
+    NSError*    err = nil;
+    if( [tester tryFindingAccessibilityElement:nil view:&tv withIdentifier:@"Chat list" tappable:false error:&err] ){
+        XCTAssert(tv != nil);
+        XCTAssert([tv numberOfRowsInSection:0] == 0); // no more messages
+    } else {
+        NSLog(@"Error: %@",err);
+    }
+    
+    [self goBackFromChat];
+}
+
+- (void)testRemoveAllChats {
+    NSArray* uuids = [self getUUIDArrayOfSize:5];
+    
+    for( NSString* uuid in uuids ){
+        [self startChatWith:uuid];
+        [self sendMessage:@"Test"];
+        [self goBackFromChat];
+    }
+    
+    [tester tapViewWithAccessibilityLabel:@"Edit" traits:UIAccessibilityTraitButton];
+    
+    // we expect to be able to delete at least the amount of chatrooms we created
+    for( int i =0; i< uuids.count; i++){
+        [tester tapViewWithAccessibilityLabel:@"Delete" traits:UIAccessibilityTraitButton];
+    }
+    
+    // then we try to delete all the rest of chatrooms
+    while ( [tester tryFindingTappableViewWithAccessibilityLabel:@"Delete" traits:UIAccessibilityTraitButton error:nil] )
+    {
+        [tester tapViewWithAccessibilityLabel:@"Delete" traits:UIAccessibilityTraitButton];
+        NSLog(@"Deleting an extra chat");
+    }
+    
+    // check that the tableview is empty
+    UITableView* tv = nil;
+    NSError*    err = nil;
+    if( [tester tryFindingAccessibilityElement:nil view:&tv withIdentifier:@"ChatRoom list" tappable:false error:&err] ){
+        XCTAssert(tv != nil);
+        XCTAssert([tv numberOfRowsInSection:0] == 0); // no more chat rooms
+    } else {
+        NSLog(@"Error: %@",err);
+    }
+    
+    // test that there's no more chatrooms in the core
+    XCTAssert(linphone_core_get_chat_rooms([LinphoneManager getLc]) == nil);
+}
+
+
+@end
diff --git a/KifTests/ContactsTester.h b/KifTests/ContactsTester.h
new file mode 100644
index 000000000..7c8e2f052
--- /dev/null
+++ b/KifTests/ContactsTester.h
@@ -0,0 +1,13 @@
+//
+//  ContactsTester.h
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 17/02/2015.
+//
+//
+
+#import "LinphoneTestCase.h"
+
+@interface ContactsTester : LinphoneTestCase
+
+@end
diff --git a/KifTests/ContactsTester.m b/KifTests/ContactsTester.m
new file mode 100644
index 000000000..a0a9a7838
--- /dev/null
+++ b/KifTests/ContactsTester.m
@@ -0,0 +1,78 @@
+//
+//  ContactsTester.m
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 17/02/2015.
+//
+//
+
+#import "ContactsTester.h"
+
+#import "ContactDetailsTableViewController.h"
+
+@implementation ContactsTester
+
+#pragma mark - Setup
+
+- (void)beforeAll {
+    [tester tapViewWithAccessibilityLabel:@"Contacts"];
+}
+
+#pragma mark - Utils
+
+- (void)setText:(NSString*)text forContactHeaderIndex:(NSInteger)idx {
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:idx inSection:0] inTableViewWithAccessibilityIdentifier:@"Contact Name Table"];
+    [tester enterTextIntoCurrentFirstResponder:text];
+}
+
+- (void)setText:(NSString*)text forContactNumbersIndex:(NSInteger)idx inSection:(NSInteger)section {
+    [tester tapRowAtIndexPath:[NSIndexPath indexPathForRow:idx inSection:section] inTableViewWithAccessibilityIdentifier:@"Contact numbers table"];
+    [tester enterTextIntoCurrentFirstResponder:text];
+}
+
+- (void)createContact:(NSString*)firstName lastName:(NSString*)lastName phoneNumber:(NSString*)phone SIPAddress:(NSString*)sip {
+    
+    XCTAssert(firstName != nil);
+    [tester tapViewWithAccessibilityLabel:@"Add contact"];
+    
+    // check that the OK button is disabled
+    [tester waitForViewWithAccessibilityLabel:@"Edit" traits:UIAccessibilityTraitButton|UIAccessibilityTraitNotEnabled|UIAccessibilityTraitSelected];
+    
+    [self setText:firstName forContactHeaderIndex:0];
+    
+    // entering text should enable the "edit" button
+    [tester waitForViewWithAccessibilityLabel:@"Edit" traits:UIAccessibilityTraitButton|UIAccessibilityTraitSelected];
+    
+    if( lastName )
+        [self setText:lastName forContactHeaderIndex:1];
+    
+    if ( phone )
+    [self setText:phone forContactNumbersIndex:0 inSection:ContactSections_Number];
+    
+    if (sip)
+        [self setText:sip forContactNumbersIndex:0 inSection:ContactSections_Sip];
+    
+    [tester tapViewWithAccessibilityLabel:@"Edit"];
+    [tester tapViewWithAccessibilityLabel:@"Back"];
+    
+}
+
+#pragma mark - Tests
+
+- (void)testDeleteContact {
+    NSString* contactName = [self getUUID];
+    [self createContact:contactName lastName:@"dummy" phoneNumber:@"0102030405" SIPAddress:@"testios"];
+    
+    NSString* fullName = [contactName stringByAppendingString:@" dummy"];
+    
+    [tester tapViewWithAccessibilityLabel:@"Firstname, Lastname" value:fullName traits:UIAccessibilityTraitStaticText];
+    
+    [tester tapViewWithAccessibilityLabel:@"Edit"];
+    [tester scrollViewWithAccessibilityIdentifier:@"Contact numbers table" byFractionOfSizeHorizontal:0 vertical:-0.9];
+    
+    [tester tapViewWithAccessibilityLabel:@"Remove"];
+    
+    [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Firstname, Lastname" value:fullName traits:UIAccessibilityTraitStaticText];
+}
+
+@end
diff --git a/KifTests/Info.plist b/KifTests/Info.plist
new file mode 100644
index 000000000..fddcb8263
--- /dev/null
+++ b/KifTests/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.linphone.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/KifTests/LinphoneTestCase.h b/KifTests/LinphoneTestCase.h
new file mode 100644
index 000000000..452135db3
--- /dev/null
+++ b/KifTests/LinphoneTestCase.h
@@ -0,0 +1,23 @@
+//
+//  LinphoneTestCase.h
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 19/01/2015.
+//
+//
+
+#import <KIF/KIF.h>
+
+#define LOCALIZED(X) NSLocalizedString(X, nil)
+
+@interface LinphoneTestCase : KIFTestCase
+@property BOOL invalidAccountSet;
+
+- (void)switchToValidAccountIfNeeded;
+- (NSString*)accountUsername;
+- (NSString*)accountDomain;
+
+- (NSString*)getUUID;
+- (NSArray*)getUUIDArrayOfSize:(size_t)size;
+
+@end
diff --git a/KifTests/LinphoneTestCase.m b/KifTests/LinphoneTestCase.m
new file mode 100644
index 000000000..542cdb12d
--- /dev/null
+++ b/KifTests/LinphoneTestCase.m
@@ -0,0 +1,117 @@
+//
+//  LinphoneTestCase.m
+//  linphone
+//
+//  Created by Guillaume BIENKOWSKI on 19/01/2015.
+//
+//
+
+#import "LinphoneTestCase.h"
+
+#import "LinphoneManager.h"
+
+#import "KIF/KIFTypist.h"
+
+@implementation LinphoneTestCase
+
++ (void)initialize {
+	// default is 0.01, which sometimes confuses the simulator to the point that
+	// it will miss some keys
+	[KIFTypist setKeystrokeDelay:0.05];
+}
+
+- (NSString *)accountUsername {
+    return @"testios";
+}
+
+- (NSString *)accountDomain {
+    return @"sip.linphone.org";
+}
+
+- (NSString*)getUUID {
+    return [[NSUUID UUID] UUIDString];
+}
+
+- (NSArray *)getUUIDArrayOfSize:(size_t)size {
+    NSMutableArray* array = [NSMutableArray arrayWithCapacity:size];
+    for (NSInteger i=0; i<size; i++) {
+        [array setObject:[self getUUID] atIndexedSubscript:i];
+    }
+    return array;
+}
+
+- (void)beforeAll{
+#if TARGET_IPHONE_SIMULATOR
+    [tester acknowledgeSystemAlert];
+#endif
+	[super beforeAll];
+}
+
+
+static bool invalidAccount = true;
+
+- (void)setInvalidAccountSet:(BOOL)invalidAccountSet {
+    invalidAccount = invalidAccountSet;
+}
+
+- (BOOL)invalidAccountSet {
+    return invalidAccount;
+}
+
+- (BOOL)hasValidProxyConfig {
+    LinphoneCore* lc = [LinphoneManager getLc];
+    const MSList* proxies = linphone_core_get_proxy_config_list(lc);
+    BOOL isOK = false;
+    while(proxies){
+        LinphoneProxyConfig* cfg = (LinphoneProxyConfig*)proxies->data;
+        const char*   domain = linphone_proxy_config_get_domain(cfg);
+        const char* identity = linphone_proxy_config_get_identity(cfg);
+        LinphoneAddress* addr = linphone_core_interpret_url(lc, identity);
+        const char* username = linphone_address_get_username(addr);
+        
+        if( addr
+           && ( username && strcmp(username, [[self accountUsername] UTF8String]) == 0)
+           && ( domain   && strcmp(domain,   [[self accountDomain] UTF8String]) == 0 )
+           && linphone_proxy_config_get_state(cfg) == LinphoneRegistrationOk )
+        {
+            isOK = true;
+            linphone_address_destroy(addr);
+            break;
+        } else if( addr ) {
+            linphone_address_destroy(addr);
+        }
+        
+        proxies=proxies->next;
+    }
+    return isOK;
+}
+
+- (void)switchToValidAccountIfNeeded {
+    [UIView setAnimationsEnabled:false];
+    
+    if( invalidAccount && ! [self hasValidProxyConfig] ){
+        
+        [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Settings")];
+		[tester tapViewWithAccessibilityLabel:@"Run assistant"];
+        [tester waitForTimeInterval:0.5];
+        if( [tester tryFindingViewWithAccessibilityLabel:LOCALIZED(@"Launch Wizard") error:nil]){
+            [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Launch Wizard")];
+            [tester waitForTimeInterval:0.5];
+        }
+        
+        NSLog(@"Switching to a valid account");
+        
+        [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Start")];
+        [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Sign in linphone.org account")];
+        
+        [tester enterText:@"testios" intoViewWithAccessibilityLabel:LOCALIZED(@"Username")];
+        [tester enterText:@"testtest" intoViewWithAccessibilityLabel:LOCALIZED(@"Password")];
+        
+        [tester tapViewWithAccessibilityLabel:LOCALIZED(@"Sign in")];
+        
+        invalidAccount = false;
+    }
+}
+
+
+@end
diff --git a/KifTests/WizardTester.h b/KifTests/WizardTester.h
new file mode 100644
index 000000000..ee02ad947
--- /dev/null
+++ b/KifTests/WizardTester.h
@@ -0,0 +1,13 @@
+	//
+//  WizardTester.h
+//  linphone
+//
+//  Created by Guillaume on 17/01/2015.
+//
+//
+
+#import "LinphoneTestCase.h"
+
+@interface WizardTester : LinphoneTestCase
+
+@end
\ No newline at end of file
diff --git a/KifTests/WizardTester.m b/KifTests/WizardTester.m
new file mode 100644
index 000000000..4ac3c337c
--- /dev/null
+++ b/KifTests/WizardTester.m
@@ -0,0 +1,116 @@
+//
+//  WizardTester.m
+//  linphone
+//
+//  Created by Guillaume on 17/01/2015.
+//
+//
+
+
+#import "WizardTester.h"
+#import <KIF/KIF.h>
+
+@implementation WizardTester
+
+- (void)beforeEach {
+    [UIView setAnimationsEnabled:false];
+    
+    [tester tapViewWithAccessibilityLabel:@"Settings"];
+    [tester tapViewWithAccessibilityLabel:@"Run assistant"];
+    [tester waitForTimeInterval:0.5];
+    if( [tester tryFindingViewWithAccessibilityLabel:@"Launch Wizard" error:nil]){
+        [tester tapViewWithAccessibilityLabel:@"Launch Wizard"];
+        [tester waitForTimeInterval:0.5];
+    }
+}
+
+- (void)afterEach{
+    [tester tapViewWithAccessibilityLabel:@"Dialer"];
+}
+
+#pragma mark - State 
+
++ (void)switchToValidAccountWithTester:(KIFTestCase*)testCase {
+}
+
+#pragma mark - Utilities
+
+- (void)_linphoneLogin:(NSString*)username withPW:(NSString*)pw {
+    [tester tapViewWithAccessibilityLabel:@"Start"];
+    [tester tapViewWithAccessibilityLabel:@"Sign in linphone.org account"];
+    
+    [tester enterText:username intoViewWithAccessibilityLabel:@"Username"];
+    [tester enterText:pw intoViewWithAccessibilityLabel:@"Password"];
+    
+    [tester tapViewWithAccessibilityLabel:@"Sign in"];
+}
+
+
+
+- (void)_externalLoginWithProtocol:(NSString*)protocol {
+    
+    [self setInvalidAccountSet:true];
+    [tester tapViewWithAccessibilityLabel:@"Start"];
+    [tester tapViewWithAccessibilityLabel:@"Sign in SIP account"];
+    
+    [tester enterText:@"testios" intoViewWithAccessibilityLabel:@"Username"];
+    [tester enterText:@"testtest" intoViewWithAccessibilityLabel:@"Password"];
+    [tester enterText:@"sip.linphone.org" intoViewWithAccessibilityLabel:@"Domain"];
+    [tester tapViewWithAccessibilityLabel:protocol];
+    
+    [tester tapViewWithAccessibilityLabel:@"Sign in"];
+    
+    // check the registration state
+    UIView* regState = [tester waitForViewWithAccessibilityLabel:@"Registration state"];
+    [tester waitForTimeInterval:1];
+    [tester expectView:regState toContainText:@"Registered"];
+}
+
+#pragma mark - Tests
+
+- (void)testLinphoneLogin {
+
+    [self _linphoneLogin:@"testios" withPW:@"testtest"];
+    
+    // check the registration state
+    UIView* regState = [tester waitForViewWithAccessibilityLabel:@"Registration state"];
+    [tester waitForTimeInterval:1];
+    [tester expectView:regState toContainText:@"Registered"];
+    
+}
+
+- (void)testLinphoneLoginWithBadPassword {
+    [self _linphoneLogin:@"testios" withPW:@"badPass"];
+    
+    [self setInvalidAccountSet:true];
+    
+    UIView* alertViewText = [tester waitForViewWithAccessibilityLabel:@"Registration failure" traits:UIAccessibilityTraitStaticText];
+    if( alertViewText ){
+        UIView *reason = [tester waitForViewWithAccessibilityLabel:@"Forbidden" traits:UIAccessibilityTraitStaticText];
+        if( reason == nil ){ [tester fail];
+        } else {
+            [tester tapViewWithAccessibilityLabel:@"OK"]; // alertview
+            [tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel wizard
+        }
+    } else {
+        [tester fail];
+    }
+}
+
+- (void)testExternalLoginWithUDP {
+    [self _externalLoginWithProtocol:@"UDP"];
+}
+
+- (void)testExternalLoginWithTCP {
+    [self _externalLoginWithProtocol:@"TCP"];
+}
+
+- (void)testExternalLoginWithTLS {
+    [self _externalLoginWithProtocol:@"TLS"];
+}
+
+
+
+
+
+@end
diff --git a/README.md b/README.md
index 84bf68afc..a8c22f7c2 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,29 @@
 # Linphone on iPhone
 
+[![Build Status](https://travis-ci.org/Gui13/linphone-iphone.svg?branch=kif)](https://travis-ci.org/Gui13/linphone-iphone)
+
 ## Build prerequisite
 
-Linphone for iPhone depends on liblinphone SDK. This SDK is generated from makefiles and shell scripts. Before building Linphone on iPhone, please read and execute [liblinphone README](submodule/linphone/README.macos.md).
+Linphone for iPhone depends on liblinphone SDK. This SDK is generated from makefiles and shell scripts.
 
-You will NOT be able to build the SDK if you did not read liblinphone README first!
+* Xcode (download from apple or using appstore application)
+* [Java SE](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or openJDK
+ This is required to generate a C sourcefile from SIP grammar using [antlr3](http://www.antlr3.org/) generator.
+* [HomeBrew](http://brew.sh) or [Macports](http://www.macports.org/).
 
-### Additional dependencies
+
+### Install dependencies
 
 * Using HomeBrew:
 
-        brew install imagemagick yasm nasm
+        brew install autoconf automake pkg-config doxygen java nasm gettext wget yasm optipng imagemagick coreutils intltool
+        # antlr3.2 is faster than default homebrew version 3.4 - you can install official antlr3 though
+        brew tap Gui13/linphone
+        brew install antlr3.2
 
 * Using MacPorts:
 
-        sudo port install ImageMagick optipng yasm nasm
+        sudo port install autoconf automake pkg-config doxygen antlr3 java nasm gettext wget yasm optipng ImageMagick coreutils intltool
 
 ### System linking
 
@@ -28,13 +37,13 @@ You will NOT be able to build the SDK if you did not read liblinphone README fir
 
         export PATH=$LOCAL_BIN_DIR:$PATH
 
-* Install [gas-preprosessor.pl](http://github.com/yuvi/gas-preprocessor/) (version above July 2013) into your `LOCAL_BIN_DIR` directory
+* Install [gas-preprosessor.pl](http://github.com/yuvi/gas-preprocessor/) (version above July 2013) into your PATH. Suppose you use `LOCAL_BIN_DIR` directory:
 
         wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl
         chmod +x gas-preprocessor.pl
         sudo mv gas-preprocessor.pl $LOCAL_BIN_DIR
 
-* Link `libtoolize` to `glibtoolize`
+* (HomeBrew only) Link `libtoolize` to `glibtoolize`
 
         sudo ln -s $LOCAL_BIN_DIR/glibtoolize $LOCAL_BIN_DIR/libtoolize
 
@@ -87,6 +96,13 @@ After the SDK is built, just open the Linphone Xcode project with Xcode, and pre
  Linphone controls the embedding of these codecs thanks to the preprocessor macros HAVE_SILK, HAVE_AMR, HAVE_G729 HAVE_OPENH264 positioned in Xcode project.
  Before embedding these 4 codecs in the final application, make sure to have the right to do so.
 
+## TESTING THE APPLICATION
+
+We are using the KIF framework to test the UI of Linphone. It is used as a submodule (instead of CocoaPods) for ease.
+
+Simply press `Command + U` and the default simulator / device will launch and try to pass all the tests.
+
+
 ## LIMITATIONS, KNOWN BUGS
 
 * Video capture does not work in simulator (not implemented by simulator?).
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 8b34acaac..4f874d8c2 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index cb4167fd8..1259548b0 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 22f46c686..81e470851 100644
--- a/Resources/en.lproj/Localizable.strings
+++ b/Resources/en.lproj/Localizable.strings
@@ -43,6 +43,9 @@
 /* No comment provided by engineer. */
 "Answer" = "Answer";
 
+/* No comment provided by engineer. */
+"Are you sure to want to clear your proxy setup?" = "Are you sure to want to clear your proxy setup?";
+
 /* No comment provided by engineer. */
 "Average" = "Average";
 
@@ -250,6 +253,9 @@
 /* No comment provided by engineer. */
 "No codec" = "No codec";
 
+/* No comment provided by engineer. */
+"No connectivity" = "No connectivity";
+
 /* No comment provided by engineer. */
 "No microphone" = "No microphone";
 
@@ -283,6 +289,9 @@
 /* No comment provided by engineer. */
 "Please enter a valid domain.\n" = "Please enter a valid domain.\n";
 
+/* No comment provided by engineer. */
+"Please enter a valid username" = "Please enter a valid username";
+
 /* No comment provided by engineer. */
 "Please enter a valid username.\n" = "Please enter a valid username.\n";
 
@@ -346,6 +355,9 @@
 /* No comment provided by engineer. */
 "SIP addresses" = "SIP addresses";
 
+/* No comment provided by engineer. */
+"Stay here" = "Stay here";
+
 /* No comment provided by engineer. */
 "Stop video" = "Stop video";
 
@@ -397,6 +409,9 @@
 /* No comment provided by engineer. */
 "Yes" = "Yes";
 
+/* No comment provided by engineer. */
+"You can either skip verification or connect to the Internet first." = "You can either skip verification or connect to the Internet first.";
+
 /* No comment provided by engineer. */
 "You missed a call from %@" = "You missed a call from %@";
 
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index b38bdeda6..5b7ba9cfe 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 18c87b3db..e8274a38f 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index ed548e5fd..0a9e737e4 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/ar.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
similarity index 92%
rename from ar.lproj/Localizable.strings
rename to Resources/zh_TW.lproj/Localizable.strings
index 80cc71667..f51670b73 100644
Binary files a/ar.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist
index 890678ce1..4eb893d65 100644
--- a/Settings/InAppSettings.bundle/Network.plist
+++ b/Settings/InAppSettings.bundle/Network.plist
@@ -124,6 +124,7 @@
 				<string>None</string>
 				<string>SRTP</string>
 				<string>ZRTP</string>
+				<string>DTLS</string>
 			</array>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
@@ -132,6 +133,7 @@
 				<string>None</string>
 				<string>SRTP</string>
 				<string>ZRTP</string>
+				<string>DTLS</string>
 			</array>
 		</dict>
 		<dict>
diff --git a/Settings/InAppSettings.bundle/Root.plist b/Settings/InAppSettings.bundle/Root.plist
index 18622f716..62dbcc5ec 100644
--- a/Settings/InAppSettings.bundle/Root.plist
+++ b/Settings/InAppSettings.bundle/Root.plist
@@ -18,6 +18,14 @@
 			<key>Type</key>
 			<string>IASKButtonSpecifier</string>
 		</dict>
+		<dict>
+			<key>Key</key>
+			<string>clear_proxy_button</string>
+			<key>Title</key>
+			<string>Clear Account</string>
+			<key>Type</key>
+			<string>IASKButtonSpecifier</string>
+		</dict>
 		<dict>
 			<key>AutocapitalizationType</key>
 			<string>None</string>
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Root.strings b/Settings/InAppSettings.bundle/ar.lproj/Root.strings
index 9521d0a78..030f39138 100644
--- a/Settings/InAppSettings.bundle/ar.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/ar.lproj/Root.strings
@@ -60,3 +60,6 @@
 
 /* More options */
 "More options" = "الخيارات الأخرى";
+
+/* Clear Account */
+"Clear Account" = "Clear Account";
\ No newline at end of file
diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index 694ab7da8..442bf4709 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -60,3 +60,6 @@
 
 /* More options */
 "More options" = "More options";
+
+/* Clear Account */
+"Clear Account" = "Clear Account";
\ No newline at end of file
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Root.strings b/Settings/InAppSettings.bundle/fr.lproj/Root.strings
index b8e38a79c..46244e4a1 100644
--- a/Settings/InAppSettings.bundle/fr.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/fr.lproj/Root.strings
@@ -60,3 +60,6 @@
 
 /* More options */
 "More options" = "Plus d'options";
+
+/* Clear Account */
+"Clear Account" = "Effacer le compte";
\ No newline at end of file
diff --git a/Settings/InAppSettings.bundle/ru.lproj/Root.strings b/Settings/InAppSettings.bundle/ru.lproj/Root.strings
index d728e8bac..58b135b33 100644
--- a/Settings/InAppSettings.bundle/ru.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/ru.lproj/Root.strings
@@ -60,3 +60,6 @@
 
 /* More options */
 "More options" = "Дополнительный счет";
+
+/* Clear Account */
+"Clear Account" = "Clear Account";
\ No newline at end of file
diff --git a/Tools/check_tools.sh b/Tools/check_tools.sh
new file mode 100755
index 000000000..66bd67a2a
--- /dev/null
+++ b/Tools/check_tools.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+error_on_quit=0
+
+echo_err() {
+	 echo "$@" >&2
+	 error_on_quit=1
+}
+
+check_installed() {
+	if [ -z "$(which $1)" ]; then
+		echo_err "Could not find $1. Please install $2."
+		return 1
+	fi
+	return 0
+}
+
+cd $(dirname $0)/..
+
+#autoconf pkg-config java ant yasm nasm wget
+for prog in autoconf automake pkg-config doxygen java nasm gettext wget yasm optipng; do
+	check_installed "$prog" "it"
+done
+
+check_installed "ginstall" "coreutils"
+check_installed "intltoolize" "intltool"
+check_installed "convert" "imagemagick"
+
+if ! check_installed "libtoolize" "libtool"; then
+	if [ ! -z "$(which glibtoolize)" ]; then
+		echo_err "Note: it seems that you are using HomeBrew. Please do a symbolic link from " \
+				 "glibtoolize to libtoolize: 'ln -s $(which glibtoolize) /usr/local/bin/libtoolize'"
+	fi
+fi
+
+# needed by x264
+check_installed "gas-preprocessor.pl" "it following the README.md"
+
+if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then
+	echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly."
+fi
+
+if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \
+	|| find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then
+	echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?"
+fi
+
+if ! xcrun --sdk iphoneos --show-sdk-path &>/dev/null; then
+	echo_err "iOS SDK not found, please install Xcode from AppStore or equivalent"
+elif [ ! -f $(xcrun --sdk iphonesimulator --show-sdk-platform-path)/Developer/usr/bin/strings ]; then
+	echo_err "strings binary missing, please run 'sudo ln -s $(which strings) $(xcrun --sdk iphonesimulator --show-sdk-platform-path)/Developer/usr/bin/strings'"
+fi
+
+if [ $error_on_quit != 0 ]; then
+	echo "Failed to detect required tools, aborting. Please run 'make very-clean' before rerunning 'make'"
+fi
+
+exit $error_on_quit
diff --git a/Tools/generate_strings_files.sh b/Tools/generate_strings_files.sh
index f0d0f5ab6..9619883c6 100755
--- a/Tools/generate_strings_files.sh
+++ b/Tools/generate_strings_files.sh
@@ -2,6 +2,8 @@
 
 root_directory=$(cd "$(dirname $0)" && pwd)/../
 
+set -e
+
 # The 2 only specific cases of the application: since we are length limited for push
 # notifications, the ID is not matching the English translation... so we must keep
 # the translations!
@@ -17,31 +19,32 @@ sed -i.bak "s/= \"IM_MSG\";/= \"$IM_MSG_EN\";/" $localizable_en
 rm $localizable_en.bak
 
 to_utf8=$(mktemp -t linphone)
-for xibfile in $(find $(find $root_directory/Classes -name Base.lproj) -name '*.xib'); do
-	stringsfile=${xibfile/.xib/.strings}
 
-	ibtool --generate-strings-file $stringsfile $xibfile
+find $root_directory/Classes -not -path "$root_directory/Classes/KIF/*" -name Base.lproj -exec find {} -name '*.xib' \; | while read -r xibfile; do
+	stringsfile="${xibfile/.xib/.strings}"
 
-    # remove if empty
-    iconv -f utf-16 -t utf-8 $stringsfile > $to_utf8
-    if [ ! -s $to_utf8 ]; then
-    	echo "$(basename $stringsfile) is empty, removing"
-    	rm $stringsfile
-    else
-		echo "$(basename $xibfile)->$(basename $stringsfile)"
+	ibtool --generate-strings-file "$stringsfile" "$xibfile"
 
-		res_name=$(basename $stringsfile | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
-		dir_name=$(echo $(dirname $stringsfile) | sed -E "s|$root_directory/||")
+	# remove if empty
+	iconv -f utf-16 -t utf-8 "$stringsfile" > "$to_utf8"
+	if [ ! -s "$to_utf8" ]; then
+		echo "$(basename "$stringsfile") is empty, removing"
+		rm "$stringsfile"
+	else
+		echo "$(basename "$xibfile")->$(basename "$stringsfile")"
+
+		res_name=$(basename "$stringsfile" | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
+		dir_name=$(echo $(dirname "$stringsfile") | sed -E "s|$root_directory/||")
 		# if not registered in transifex config file, register it
 		if ! grep -q $res_name $root_directory/.tx/config; then
 			echo "not found in .tx/config, adding it"
 			echo "
 [linphone-ios.$res_name]
-file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename $stringsfile)
-source_file = $dir_name/$(basename $stringsfile)
+file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename "$stringsfile")
+source_file = $dir_name/$(basename "$stringsfile")
 source_lang = en
 " >> $root_directory/.tx/config
 		fi
-    fi
+	fi
 done
 rm $to_utf8
diff --git a/Tools/update_localization.sh b/Tools/update_localization.sh
deleted file mode 100755
index fffb57f3d..000000000
--- a/Tools/update_localization.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-root_directory=$(cd "$(dirname $0)" && pwd)/../
-
-rm $root_directory/Resources/en.lproj/Localizable.strings
-find $root_directory/Classes -name '*.m' | xargs genstrings -u -a -o $root_directory/Resources/en.lproj/
-
-to_utf8=$(mktemp -t linphone)
-for xibfile in $(find $(find $root_directory/Classes -name Base.lproj) -name '*.xib'); do
-	stringsfile=${xibfile/.xib/.strings}
-
-	ibtool --generate-strings-file $stringsfile $xibfile
-
-    # remove if empty
-    iconv -f utf-16 -t utf-8 $stringsfile > $to_utf8
-    if [ ! -s $to_utf8 ]; then
-    	echo "$(basename $stringsfile) is empty, removing"
-    	rm $stringsfile
-    else
-		echo "$(basename $xibfile)->$(basename $stringsfile)"
-
-		res_name=$(basename $stringsfile | tr -d '_.~-' | tr '[:upper:]' '[:lower:]')
-		dir_name=$(echo $(dirname $stringsfile) | sed -E "s|$root_directory/||")
-		# if not registered in transifex config file, register it
-		if ! grep -q $res_name $root_directory/.tx/config; then
-			echo "not found in .tx/config, adding it"
-			echo "
-[linphone-ios.$res_name]
-file_filter = $(echo $dir_name| sed 's/Base.lproj/<lang>.lproj/')/$(basename $stringsfile)
-source_file = $dir_name/$(basename $stringsfile)
-source_lang = en
-" >> $root_directory/.tx/config
-		fi
-    fi
-done
-rm $to_utf8
diff --git a/disable-security.patch b/disable-security.patch
deleted file mode 100644
index 98f46d90a..000000000
--- a/disable-security.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist
-index 5bc0378..9d011f1 100644
---- a/Settings.bundle/Root.plist
-+++ b/Settings.bundle/Root.plist
-@@ -169,7 +169,7 @@
- 			<array>
- 				<string>udp</string>
- 				<string>tcp</string>
--				<string>tls</string>
-+				<!--string>tls</string-->
- 			</array>
- 			<key>Type</key>
- 			<string>PSMultiValueSpecifier</string>
-@@ -177,10 +177,10 @@
- 			<array>
- 				<string>udp</string>
- 				<string>tcp</string>
--				<string>tls</string>
-+				<!--string>tls</string-->
- 			</array>
- 		</dict>
--		<dict>
-+		<!--dict>
- 			<key>DefaultValue</key>
- 			<false/>
- 			<key>Key</key>
-@@ -189,7 +189,7 @@
- 			<string>Secure rtp</string>
- 			<key>Type</key>
- 			<string>PSToggleSwitchSpecifier</string>
--		</dict>
-+		</dict-->
- 		<dict>
- 			<key>DefaultValue</key>
- 			<true/>
diff --git a/linphone-Info.plist b/linphone-Info.plist
index d75adf8e8..6068e586b 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.4</string>
+	<string>3.7.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.4.2</string>
+	<string>2.2.5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 4d8a483e4..660142633 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -696,6 +696,7 @@
 		F08F119D19C0A65B007D70C2 /* NSObject+DTRuntime.m in Sources */ = {isa = PBXBuildFile; fileRef = F08F119C19C0A65B007D70C2 /* NSObject+DTRuntime.m */; };
 		F08F11A019C0A6CB007D70C2 /* DTObjectBlockExecutor.m in Sources */ = {isa = PBXBuildFile; fileRef = F08F119F19C0A6CB007D70C2 /* DTObjectBlockExecutor.m */; };
 		F0938159188E629800A55DFA /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = F0938158188E629800A55DFA /* iTunesArtwork */; };
+		F0A1CE081A6B056E001CA2BE /* ChatTester.m in Sources */ = {isa = PBXBuildFile; fileRef = F0A1CE071A6B056E001CA2BE /* ChatTester.m */; };
 		F0B4FB5D1A65550B00637027 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F0B4FB5C1A65550B00637027 /* Images.xcassets */; };
 		F0B89C2218DC89E30050B60E /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B89C2118DC89E30050B60E /* MediaPlayer.framework */; };
 		F0B89C2818DC973E0050B60E /* wizard_external_sip.rc in Resources */ = {isa = PBXBuildFile; fileRef = F0B89C2418DC973E0050B60E /* wizard_external_sip.rc */; };
@@ -772,11 +773,15 @@
 		F0C1F9211A2CA35A009402C9 /* sounds in Resources */ = {isa = PBXBuildFile; fileRef = F0BB8C3B19362C2200974404 /* sounds */; };
 		F0C1F9221A2CA35C009402C9 /* images in Resources */ = {isa = PBXBuildFile; fileRef = F0BB8C3A19362C2200974404 /* images */; };
 		F0C1F9231A2CA35E009402C9 /* certificates in Resources */ = {isa = PBXBuildFile; fileRef = F0BB8C3919362C2200974404 /* certificates */; };
+		F0C773921A94828900E0C486 /* libKIF.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0C773871A94822700E0C486 /* libKIF.a */; };
+		F0F952121A6AECD300254160 /* WizardTester.m in Sources */ = {isa = PBXBuildFile; fileRef = F0F952111A6AECD300254160 /* WizardTester.m */; };
 		F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; };
 		F84015BF1939FE37006ABAB5 /* test_failed.png in Resources */ = {isa = PBXBuildFile; fileRef = F84015BC1939FE37006ABAB5 /* test_failed.png */; };
 		F84015C01939FE37006ABAB5 /* test_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = F84015BD1939FE37006ABAB5 /* test_inprogress.png */; };
 		F84015C11939FE37006ABAB5 /* test_passed.png in Resources */ = {isa = PBXBuildFile; fileRef = F84015BE1939FE37006ABAB5 /* test_passed.png */; };
 		F84015C7193B4E34006ABAB5 /* LogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F84015C6193B4E34006ABAB5 /* LogsViewController.m */; };
+		F844AB141A93E3A200428306 /* ContactsTester.m in Sources */ = {isa = PBXBuildFile; fileRef = F844AB131A93E3A200428306 /* ContactsTester.m */; };
+		F85554481A6DA2F400A9F915 /* LinphoneTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -815,6 +820,55 @@
 			remoteGlobalIDString = F0BB8BD41936208100974404;
 			remoteInfo = LinphoneTester;
 		};
+		F0C773861A94822700E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EABD46AA1857A0C700A5F081;
+			remoteInfo = KIF;
+		};
+		F0C773881A94822700E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EB72047C1680DDAD00278DA2;
+			remoteInfo = "KIF-OCUnit";
+		};
+		F0C7738A1A94822700E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EB60ECC1177F8C83005A041A;
+			remoteInfo = "Test Host";
+		};
+		F0C7738C1A94822700E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EABD46CD1857A0F300A5F081;
+			remoteInfo = "KIF Tests";
+		};
+		F0C7738E1A94822700E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EB60ECEB177F8DB3005A041A;
+			remoteInfo = "KIF Tests-OCUnit";
+		};
+		F0C773901A94827E00E0C486 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = EABD46791857A0C700A5F081;
+			remoteInfo = KIF;
+		};
+		F0F952061A6AEB1000254160 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 1D6058900D05DD3D006BFB54;
+			remoteInfo = linphone;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -870,6 +924,7 @@
 		1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneAppDelegate.m; sourceTree = "<group>"; };
 		1D6058910D05DD3D006BFB54 /* linphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = linphone.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		1FE76362DA6217E7341ED1DF /* libPods-KifTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-KifTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = "<group>"; };
 		220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = "<group>"; };
 		220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = "<group>"; };
@@ -1684,6 +1739,10 @@
 		F095485C1883F68800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/WizardViewController~ipad.strings"; sourceTree = "<group>"; };
 		F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViews.strings; sourceTree = "<group>"; };
 		F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViews.strings; sourceTree = "<group>"; };
+		F0A1CE061A6B056E001CA2BE /* ChatTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatTester.h; sourceTree = "<group>"; };
+		F0A1CE071A6B056E001CA2BE /* ChatTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatTester.m; sourceTree = "<group>"; };
+		F0A1CE091A6B05A4001CA2BE /* WizardTester.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WizardTester.h; sourceTree = "<group>"; };
+		F0ADFCF91A78EB83004F1102 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = Resources/ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutViewController.strings; sourceTree = "<group>"; };
 		F0AF06F11A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
 		F0AF06F21A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ChatViewController.strings; sourceTree = "<group>"; };
@@ -1722,7 +1781,6 @@
 		F0AF07131A24BA780086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main_iPhone.strings; sourceTree = "<group>"; };
 		F0AF07151A24BA780086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F0AF07161A24BA780086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F0AF07171A24BA780086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F0B4FB5C1A65550B00637027 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Resources/Images.xcassets; sourceTree = "<group>"; };
 		F0B89C2118DC89E30050B60E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
 		F0B89C2418DC973E0050B60E /* wizard_external_sip.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = wizard_external_sip.rc; path = Resources/wizard_external_sip.rc; sourceTree = "<group>"; };
@@ -1764,11 +1822,19 @@
 		F0C1F90A1A28781F009402C9 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		F0C1F90B1A28781F009402C9 /* strech-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-bottom.png"; sourceTree = "<group>"; };
 		F0C1F90C1A28781F009402C9 /* strech-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "strech-top.png"; sourceTree = "<group>"; };
+		F0C7737D1A94822600E0C486 /* KIF.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KIF.xcodeproj; path = Classes/KIF/KIF.xcodeproj; sourceTree = SOURCE_ROOT; };
+		F0F952001A6AEB1000254160 /* KifTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KifTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		F0F952031A6AEB1000254160 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		F0F952111A6AECD300254160 /* WizardTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WizardTester.m; sourceTree = "<group>"; };
 		F84015BC1939FE37006ABAB5 /* test_failed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_failed.png; path = Resources/test_failed.png; sourceTree = "<group>"; };
 		F84015BD1939FE37006ABAB5 /* test_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_inprogress.png; path = Resources/test_inprogress.png; sourceTree = "<group>"; };
 		F84015BE1939FE37006ABAB5 /* test_passed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = test_passed.png; path = Resources/test_passed.png; sourceTree = "<group>"; };
 		F84015C5193B4E34006ABAB5 /* LogsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogsViewController.h; sourceTree = "<group>"; };
 		F84015C6193B4E34006ABAB5 /* LogsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogsViewController.m; sourceTree = "<group>"; };
+		F844AB121A93E3A200428306 /* ContactsTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsTester.h; sourceTree = "<group>"; };
+		F844AB131A93E3A200428306 /* ContactsTester.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsTester.m; sourceTree = "<group>"; };
+		F85554461A6DA2F400A9F915 /* LinphoneTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneTestCase.h; sourceTree = "<group>"; };
+		F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneTestCase.m; sourceTree = "<group>"; };
 		FD979F30169E84670022A8B4 /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = Resources/ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1894,6 +1960,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		F0F951FD1A6AEB1000254160 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F0C773921A94828900E0C486 /* libKIF.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -1991,6 +2065,7 @@
 				1D6058910D05DD3D006BFB54 /* linphone.app */,
 				F0BB8BD51936208100974404 /* LinphoneTester.app */,
 				F08F118419C09C6A007D70C2 /* LinphoneTester Tests.xctest */,
+				F0F952001A6AEB1000254160 /* KifTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -2097,11 +2172,11 @@
 			children = (
 				633E388219FFB0F400936D1C /* README.md */,
 				080E96DDFE201D6D7F000001 /* Classes */,
+				F0F952011A6AEB1000254160 /* UITests */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				F04892FE180C3296002FED35 /* ImageOptim.sh */,
 				F0938158188E629800A55DFA /* iTunesArtwork */,
 				F0BB8BD91936208100974404 /* LinphoneTester */,
-				F08F118819C09C6B007D70C2 /* LinphoneTester Tests */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
@@ -2191,6 +2266,7 @@
 				22509041196BD902007863F6 /* libopenh264.a */,
 				22AF73C11754C0D000BE8398 /* libopus.a */,
 				220FAD2C10765B400068D98F /* libortp.a */,
+				1FE76362DA6217E7341ED1DF /* libPods-KifTests.a */,
 				57B0E35F173C010400A476B8 /* libpolarssl.a */,
 				F0BB8C34193624C800974404 /* libresolv.9.dylib */,
 				22D1B68012A3E0BE001AE361 /* libresolv.dylib */,
@@ -2410,7 +2486,7 @@
 				F08F118919C09C6B007D70C2 /* Supporting Files */,
 			);
 			path = "LinphoneTester Tests";
-			sourceTree = "<group>";
+			sourceTree = SOURCE_ROOT;
 		};
 		F08F118919C09C6B007D70C2 /* Supporting Files */ = {
 			isa = PBXGroup;
@@ -2913,6 +2989,7 @@
 		F0BB8BD91936208100974404 /* LinphoneTester */ = {
 			isa = PBXGroup;
 			children = (
+				F08F118819C09C6B007D70C2 /* LinphoneTester Tests */,
 				F0BB8BE21936208100974404 /* AppDelegate.h */,
 				F0BB8BE31936208100974404 /* AppDelegate.m */,
 				F0BB8BEE1936208200974404 /* DetailViewController.h */,
@@ -2965,6 +3042,44 @@
 			path = Resources/launchscreen;
 			sourceTree = "<group>";
 		};
+		F0C7737E1A94822600E0C486 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				F0C773871A94822700E0C486 /* libKIF.a */,
+				F0C773891A94822700E0C486 /* libKIF-OCUnit.a */,
+				F0C7738B1A94822700E0C486 /* Test Host.app */,
+				F0C7738D1A94822700E0C486 /* KIF Tests - XCTest.xctest */,
+				F0C7738F1A94822700E0C486 /* KIF Tests-OCUnit.octest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		F0F952011A6AEB1000254160 /* UITests */ = {
+			isa = PBXGroup;
+			children = (
+				F0C7737D1A94822600E0C486 /* KIF.xcodeproj */,
+				F0F952021A6AEB1000254160 /* Supporting Files */,
+				F0F952111A6AECD300254160 /* WizardTester.m */,
+				F0A1CE091A6B05A4001CA2BE /* WizardTester.h */,
+				F0A1CE061A6B056E001CA2BE /* ChatTester.h */,
+				F0A1CE071A6B056E001CA2BE /* ChatTester.m */,
+				F85554461A6DA2F400A9F915 /* LinphoneTestCase.h */,
+				F85554471A6DA2F400A9F915 /* LinphoneTestCase.m */,
+				F844AB121A93E3A200428306 /* ContactsTester.h */,
+				F844AB131A93E3A200428306 /* ContactsTester.m */,
+			);
+			name = UITests;
+			path = KifTests;
+			sourceTree = "<group>";
+		};
+		F0F952021A6AEB1000254160 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				F0F952031A6AEB1000254160 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -3026,6 +3141,25 @@
 			productReference = F0BB8BD51936208100974404 /* LinphoneTester.app */;
 			productType = "com.apple.product-type.application";
 		};
+		F0F951FF1A6AEB1000254160 /* KifTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = F0F9520C1A6AEB1100254160 /* Build configuration list for PBXNativeTarget "KifTests" */;
+			buildPhases = (
+				F0F951FC1A6AEB1000254160 /* Sources */,
+				F0F951FD1A6AEB1000254160 /* Frameworks */,
+				F0F951FE1A6AEB1000254160 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				F0C773911A94827E00E0C486 /* PBXTargetDependency */,
+				F0F952071A6AEB1000254160 /* PBXTargetDependency */,
+			);
+			name = KifTests;
+			productName = KifTests;
+			productReference = F0F952001A6AEB1000254160 /* KifTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -3044,6 +3178,11 @@
 					F0BB8BD41936208100974404 = {
 						DevelopmentTeam = Z2V957B3D6;
 					};
+					F0F951FF1A6AEB1000254160 = {
+						CreatedOnToolsVersion = 6.1.1;
+						DevelopmentTeam = Z2V957B3D6;
+						TestTargetID = 1D6058900D05DD3D006BFB54;
+					};
 				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */;
@@ -3064,6 +3203,10 @@
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = F0C7737E1A94822600E0C486 /* Products */;
+					ProjectRef = F0C7737D1A94822600E0C486 /* KIF.xcodeproj */;
+				},
 				{
 					ProductGroup = D3B90E1215C2CB5700F64F8C /* Products */;
 					ProjectRef = D3B90E1115C2CB5700F64F8C /* NinePatch.xcodeproj */;
@@ -3078,6 +3221,7 @@
 				1D6058900D05DD3D006BFB54 /* linphone */,
 				F0BB8BD41936208100974404 /* LinphoneTester */,
 				F08F118319C09C6A007D70C2 /* LinphoneTester Tests */,
+				F0F951FF1A6AEB1000254160 /* KifTests */,
 			);
 		};
 /* End PBXProject section */
@@ -3097,6 +3241,41 @@
 			remoteRef = D3B90E1815C2CB5800F64F8C /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		F0C773871A94822700E0C486 /* libKIF.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libKIF.a;
+			remoteRef = F0C773861A94822700E0C486 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		F0C773891A94822700E0C486 /* libKIF-OCUnit.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libKIF-OCUnit.a";
+			remoteRef = F0C773881A94822700E0C486 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		F0C7738B1A94822700E0C486 /* Test Host.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = "Test Host.app";
+			remoteRef = F0C7738A1A94822700E0C486 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		F0C7738D1A94822700E0C486 /* KIF Tests - XCTest.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "KIF Tests - XCTest.xctest";
+			remoteRef = F0C7738C1A94822700E0C486 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		F0C7738F1A94822700E0C486 /* KIF Tests-OCUnit.octest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "KIF Tests-OCUnit.octest";
+			remoteRef = F0C7738E1A94822700E0C486 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -3687,6 +3866,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		F0F951FE1A6AEB1000254160 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -3858,6 +4044,17 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		F0F951FC1A6AEB1000254160 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F0A1CE081A6B056E001CA2BE /* ChatTester.m in Sources */,
+				F844AB141A93E3A200428306 /* ContactsTester.m in Sources */,
+				F85554481A6DA2F400A9F915 /* LinphoneTestCase.m in Sources */,
+				F0F952121A6AECD300254160 /* WizardTester.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -3876,6 +4073,16 @@
 			target = F0BB8BD41936208100974404 /* LinphoneTester */;
 			targetProxy = F08F119119C09C6B007D70C2 /* PBXContainerItemProxy */;
 		};
+		F0C773911A94827E00E0C486 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = KIF;
+			targetProxy = F0C773901A94827E00E0C486 /* PBXContainerItemProxy */;
+		};
+		F0F952071A6AEB1000254160 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1D6058900D05DD3D006BFB54 /* linphone */;
+			targetProxy = F0F952061A6AEB1000254160 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -3885,7 +4092,7 @@
 				2214783C1386A2030020F8B8 /* en */,
 				D381885815FE44A700C3EDCA /* fr */,
 				FD979F30169E84670022A8B4 /* ru */,
-				F0AF07171A24BA780086C9C1 /* ar */,
+				F0ADFCF91A78EB83004F1102 /* ar */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -4311,6 +4518,7 @@
 					HAVE_SSL,
 					DEBUG,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4366,6 +4574,7 @@
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = DistributionAdhoc;
 		};
@@ -4377,7 +4586,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = "";
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
@@ -4392,6 +4601,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4447,6 +4657,7 @@
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = Release;
 		};
@@ -4457,7 +4668,7 @@
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
@@ -4472,6 +4683,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4527,6 +4739,7 @@
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = Distribution;
 		};
@@ -4538,7 +4751,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = "";
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COMPRESS_PNG_FILES = NO;
 				COPY_PHASE_STRIP = NO;
@@ -4553,6 +4766,7 @@
 					HAVE_SILK,
 					HAVE_SSL,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
@@ -4604,11 +4818,12 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = armv7;
 			};
 			name = Debug;
 		};
@@ -5024,6 +5239,187 @@
 			};
 			name = DistributionAdhoc;
 		};
+		F0F952081A6AEB1000254160 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
+				INFOPLIST_FILE = KifTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = YES;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
+			};
+			name = Debug;
+		};
+		F0F952091A6AEB1000254160 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
+				INFOPLIST_FILE = KifTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		F0F9520A1A6AEB1000254160 /* Distribution */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
+				INFOPLIST_FILE = KifTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Distribution;
+		};
+		F0F9520B1A6AEB1000254160 /* DistributionAdhoc */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)/liblinphone-sdk/apple-darwin/include",
+				);
+				INFOPLIST_FILE = KifTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					XCTest,
+					"-ObjC",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = DistributionAdhoc;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -5071,6 +5467,17 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
+		F0F9520C1A6AEB1100254160 /* Build configuration list for PBXNativeTarget "KifTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				F0F952081A6AEB1000254160 /* Debug */,
+				F0F952091A6AEB1000254160 /* Release */,
+				F0F9520A1A6AEB1000254160 /* Distribution */,
+				F0F9520B1A6AEB1000254160 /* DistributionAdhoc */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
index 6e93861d4..1b8d88a1f 100644
--- a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
+++ b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:linphone.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F0F951FF1A6AEB1000254160"
+               BuildableName = "KifTests.xctest"
+               BlueprintName = "KifTests"
+               ReferencedContainer = "container:linphone.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -28,6 +42,16 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Debug">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F0F951FF1A6AEB1000254160"
+               BuildableName = "KifTests.xctest"
+               BlueprintName = "KifTests"
+               ReferencedContainer = "container:linphone.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
diff --git a/reporter.py b/reporter.py
deleted file mode 100755
index d9fd842d4..000000000
--- a/reporter.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/python
-
-import fileinput
-import json
-import sys
-import codecs
-
-logfile = 'tests.log'
-
-f = codecs.open(logfile, 'w', 'utf8')
-
-file_events = ['begin-test', 'test-output']
-
-sys.stdout.write("Log file : " + f.name + '\n' )
-
-for line in fileinput.input():
-	obj = json.loads(line)
-
-	e = obj['event']
-
-	if e in file_events:
-		if e == 'begin-test':
-			f.write(obj['test'] )
-		elif e == 'test-output':
-			f.write(obj['output'] )
-	if e == 'end-test':
-		success = "OK\n" if obj['succeeded'] else "FAILED\n"
-		sys.stdout.write(obj['test'] + " -> " + success )
-
-	elif 'message' in obj and 'begin' in obj['event']:
-		sys.stdout.write( obj['message'] + '\n' )
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 3e43b7c2c..e5e0590db 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 3e43b7c2c85b785b2c1c5305ae70ca9a8cbc346c
+Subproject commit e5e0590db8917ccbf5631ec42022bb9f8e03b064
diff --git a/submodules/build/Makefile b/submodules/build/Makefile
index 17e2f1a25..e2e83ff3a 100644
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@@ -25,8 +25,16 @@ enable_ffmpeg=no
 enable_opus=yes
 enable_debug=no
 
-TUNNEL_AVAILABLE=$(shell git submodule status ../tunnel 2>/dev/null 1>/dev/null && echo yes)
 
+# Checks
+CHECK_MSG=$(shell ../../Tools/check_tools.sh)
+
+ifneq ($(CHECK_MSG),)
+	$(error Some tools are missing.)
+endif
+
+
+TUNNEL_AVAILABLE=$(shell git submodule status ../tunnel 2>/dev/null 1>/dev/null && echo yes)
 ifneq ($(TUNNEL_AVAILABLE),)
 	enable_tunnel=yes
 	enable_gpl_third_parties=no
@@ -102,12 +110,12 @@ broadcast_%:
 	@echo "Broadcasting target '$*' to all sub-architectures"
 	make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $* \
 	&& make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $* \
-	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $* 
+	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $*
 
 build-% clean-% veryclean-%:
 	make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $@ \
 	&& make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $@ \
-	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $@ 
+	&& make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) $@
 
 sdk:
 	make -f builder-iphone-os.mk delivery-sdk
@@ -129,6 +137,11 @@ veryclean: broadcast_veryclean
 list-packages:
 	@make -f builder-iphone-os.mk list-packages
 
+pull-transifex:
+	cd ../../ && tx pull -af
+
+push-transifex:
+	cd ../../ && ./Tools/generate_strings_files.sh && tx push -s -t -f --no-interactive
 
 zipres:
 	@tar  -C ../.. -czf ../../ios_assets.tar.gz Resources iTunesArtwork
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index f5a092f6f..879da6690 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -38,7 +38,9 @@ linphone_configure_controls = \
 				--disable-x11 \
 				--disable-tutorials \
 				--disable-tools \
-				--enable-msg-storage=yes
+				--enable-msg-storage=yes \
+				--with-polarssl=$(prefix) \
+				--enable-dtls
 
 
 #path
diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk
index 96852e698..be68d05ea 100644
--- a/submodules/build/builders.d/ffmpeg.mk
+++ b/submodules/build/builders.d/ffmpeg.mk
@@ -9,7 +9,7 @@ ffmpeg_configure_options=\
 	--cross-prefix=$$SDK_BIN_PATH/ \
 	--sysroot=$$SYSROOT_PATH --arch=$$ARCH \
 	--enable-static --disable-shared --target-os=darwin \
-	--extra-cflags="$$COMMON_FLAGS" --extra-ldflags="$$COMMON_FLAGS" \
+	--extra-cflags="-w $$COMMON_FLAGS" --extra-ldflags="$$COMMON_FLAGS" \
 	--disable-iconv \
 	--ar="$$AR" \
 	--nm="$$NM" \
@@ -19,11 +19,11 @@ ffmpeg_configure_options=\
 
 #--sysinclude=PATH        location of cross-build system headers
 ifneq (,$(findstring armv6,$(host)))
-	ffmpeg_configure_options+= --cpu=arm1176jzf-s --disable-armv5te  --enable-armv6 --enable-armv6t2 
+	ffmpeg_configure_options+= --cpu=arm1176jzf-s --disable-armv5te  --enable-armv6 --enable-armv6t2
 endif
 
 ifneq (,$(findstring armv7,$(host)))
-	ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 --disable-armv5te  --enable-armv6 --enable-armv6t2 
+	ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 --disable-armv5te  --enable-armv6 --enable-armv6t2
 endif
 
 ffmpeg_dir?=externals/ffmpeg
@@ -31,7 +31,7 @@ $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched :
 	cd $(BUILDER_SRC_DIR)/$(ffmpeg_dir) \
 	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/ffmpeg.patch \
 	&& touch $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched
-	
+
 $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak:
 	mkdir -p $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)
 	cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/ \
diff --git a/submodules/build/builders.d/gsm.mk b/submodules/build/builders.d/gsm.mk
index b8cbaace9..ce686b064 100644
--- a/submodules/build/builders.d/gsm.mk
+++ b/submodules/build/builders.d/gsm.mk
@@ -3,7 +3,9 @@
 
 gsm_dir?=externals/gsm
 
-
+#GSM build is a bit different: since there is only a Makefile,
+#we must force CC to contains CFLAGS to compile all architectures
+#as expected
 build-libgsm:
 	cp -rf $(BUILDER_SRC_DIR)/$(gsm_dir) $(BUILDER_BUILD_DIR)/$(gsm_dir)
 	rm -rf $(BUILDER_BUILD_DIR)/$(gsm_dir)/gsm/.git $(BUILDER_BUILD_DIR)/$(gsm_dir)/.git
@@ -12,12 +14,16 @@ build-libgsm:
 	cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\
 	&& mkdir -p $(prefix)/include/gsm \
 	&& host_alias=$(host)  . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&&  make -j1 CC="$${CC}" INSTALL_ROOT=$(prefix)  GSM_INSTALL_INC=$(prefix)/include/gsm  install
+	&& make install \
+			CC="$${CC} $${COMMON_FLAGS} -w" \
+			INSTALL_ROOT=$(prefix) \
+			GSM_INSTALL_INC=$(prefix)/include/gsm
 
 clean-libgsm:
 	cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\
 	&& make clean
 
 veryclean-libgsm:
-	 -cd $(BUILDER_BUILD_DIR)/$(gsm_dir) \
-	&& make uninstall
+	-rm -rf $(BUILD_DIR)/$(gsm_dir)
+
+
diff --git a/submodules/build/builders.d/libxml2.mk b/submodules/build/builders.d/libxml2.mk
index aa91779f1..ce7c72135 100644
--- a/submodules/build/builders.d/libxml2.mk
+++ b/submodules/build/builders.d/libxml2.mk
@@ -1,5 +1,5 @@
 ############################################################################
-# libxml2.mk 
+# libxml2.mk
 # Copyright (C) 2013  Belledonne Communications,Grenoble France
 #
 ############################################################################
@@ -40,7 +40,7 @@ $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile: $(BUILDER_SRC_DIR)/$(libxml2_dir)/
 	mkdir -p $(BUILDER_BUILD_DIR)/$(libxml2_dir)
 	cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) \
 	&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
-	$(BUILDER_SRC_DIR)/$(libxml2_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${libxml2_configure_options}
+	$(BUILDER_SRC_DIR)/$(libxml2_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${libxml2_configure_options} CFLAGS=-w
 
 build-libxml2: $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile
 	@echo -e "\033[01;32m building libxml2 \033[0m"
@@ -48,15 +48,15 @@ build-libxml2: $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile
 	&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
 	make && make install
 
-clean-libxml2: 
+clean-libxml2:
 	-cd  $(BUILDER_BUILD_DIR)/$(libxml2_dir) && make clean
 
-veryclean-libxml2: 
-	-cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && make distclean 
+veryclean-libxml2:
+	-cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && make distclean
 	rm -f $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure
 	cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \
 	&& git checkout configure.in \
-	&& rm -f patched.stamp 
+	&& rm -f patched.stamp
 
-clean-makefile-libxml2: 
+clean-makefile-libxml2:
 	-cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && rm -f Makefile
diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk
index cff9b9b1f..bbde3fad7 100644
--- a/submodules/build/builders.d/mssilk.mk
+++ b/submodules/build/builders.d/mssilk.mk
@@ -1,5 +1,5 @@
 ############################################################################
-# mssilk.mk 
+# mssilk.mk
 # Copyright (C) 2011  Belledonne Communications,Grenoble France
 #
 ############################################################################
@@ -28,7 +28,7 @@ ifeq ($(LINPHONE_CCACHE), ccache)
 endif
 
 $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure:
-	echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m"
+	@echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m"
 	cd $(BUILDER_SRC_DIR)/$(mssilk_dir) && ./autogen.sh
 
 $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure
@@ -42,7 +42,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co
 ifeq ($(enable_silk),yes)
 
 build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile
-	echo -e "\033[01;32m building silk \033[0m"
+	@echo -e "\033[01;32m building silk \033[0m"
 	cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \
 		&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
 		CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
@@ -57,14 +57,14 @@ else
 build-mssilk:
 	echo "SILK is disabled"
 
-endif # enable_silk	
+endif # enable_silk
 
-clean-mssilk: 
+clean-mssilk:
 	-cd  $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make clean
 
-veryclean-mssilk: 
-	-cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make distclean 
+veryclean-mssilk:
+	-cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && make distclean
 	rm -f $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure
 
-clean-makefile-mssilk: 
+clean-makefile-mssilk:
 	-cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) && rm -f Makefile
diff --git a/submodules/build/builders.d/polarssl.mk b/submodules/build/builders.d/polarssl.mk
index a3e476a4e..3aabf5fc5 100644
--- a/submodules/build/builders.d/polarssl.mk
+++ b/submodules/build/builders.d/polarssl.mk
@@ -11,17 +11,16 @@ $(BUILD_DIR)/$(polarssl_dir)/Makefile: $(SRC_DIR)/$(polarssl_dir)/configure
 	mkdir -p $(BUILD_DIR)/$(polarssl_dir)
 	cd $(BUILD_DIR)/$(polarssl_dir) \
 	&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(SRC_DIR)/build/$(config_site) \
-	$(SRC_DIR)/$(polarssl_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode}  
+	$(SRC_DIR)/$(polarssl_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode}
 
 build-polarssl: $(BUILD_DIR)/$(polarssl_dir)/Makefile
 	cd $(BUILD_DIR)/${polarssl_dir} && \
-	host_alias=$(host) && . $(SRC_DIR)/build/$(config_site) && \
-	make && make install
+	host_alias=$(host) PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(SRC_DIR)/build/$(config_site) make && make install
 
 clean-polarssl:
 	-cd $(BUILD_DIR)/$(polarssl_dir) && make clean
 
-veryclean-polarssl: 
+veryclean-polarssl:
 	-rm -rf $(BUILD_DIR)/$(polarssl_dir)
 
 clean-makefile-polarssl: veryclean-polarssl
diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site
index 033e2bd0d..95812fc57 100644
--- a/submodules/build/iphone-config.site
+++ b/submodules/build/iphone-config.site
@@ -4,22 +4,22 @@ SDK_VERSION_MAJOR=5
 SDK_VERSION=5.0
 MCPU=""
 CLANG_TARGET_SPECIFIER=miphoneos-version-min
-if test "${host_alias}" = "i386-apple-darwin" ; then 
+if test "${host_alias}" = "i386-apple-darwin" ; then
 	PLATFORM=Simulator
 	ARCH=i386
 	CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386"
 	MCPU=""
 	CLANG_TARGET_SPECIFIER=mios-simulator-version-min
-elif test "${host_alias}" = "armv7-apple-darwin" ; then 
+elif test "${host_alias}" = "armv7-apple-darwin" ; then
 	ARCH=armv7
 	PLATFORM=OS
 	CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm"
 	MCPU="-mcpu=cortex-a8"
-elif test "${host_alias}" = "aarch64-apple-darwin" ; then 
+elif test "${host_alias}" = "aarch64-apple-darwin" ; then
 	ARCH=arm64
 	PLATFORM=OS
 	CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=aarch64"
-else 
+else
 	echo "bad host ${host_alias} must be either i386-apple-darwin or arm[v7,64]-apple-darwin"
 	exit
 fi
@@ -28,12 +28,12 @@ XCODE_DEV_PATH=`xcode-select -print-path`
 #new path with Xcode 4.3:
 if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then
 	SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
-	SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin  
+	SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin
 else
 	SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*`
-	SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin  
+	SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin
 fi
-   
+
 for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ;
 echo "Selecting SDK path = ${SYSROOT_PATH}"
 
@@ -47,23 +47,24 @@ COMMON_FLAGS="$COMMON_FLAGS -Dsha256=polarssl_sha256"
 COMMON_FLAGS="-Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future $COMMON_FLAGS"
 
 # you can use ccache to speed up build, in which case just define LINPHONE_CCACHE to 'ccache'
-
-if test "$LINPHONE_CCACHE" = "ccache" ; then 
+if test "$LINPHONE_CCACHE" = "ccache" ; then
 	# ccache doesn't like some options
 	COMMON_FLAGS="$COMMON_FLAGS -Wno-variadic-macros -Wno-pointer-arith -Wno-return-type -Wno-tautological-compare -Wno-unused-function -Wno-error"
 fi
 
-CC="xcrun $LINPHONE_CCACHE clang -std=c99 $COMMON_FLAGS"
-OBJC="xcrun $LINPHONE_CCACHE clang -std=c99 $COMMON_FLAGS"
-CXX="xcrun $LINPHONE_CCACHE clang++ $COMMON_FLAGS"
-LD="xcrun ld -arch ${ARCH}"
+CC="xcrun $LINPHONE_CCACHE clang"
+OBJC="xcrun $LINPHONE_CCACHE clang"
+CXX="xcrun $LINPHONE_CCACHE clang++"
+LD="xcrun ld"
 AR="xcrun ar"
 RANLIB="xcrun ranlib"
 STRIP="xcrun strip"
 NM="xcrun nm"
 
-CPPFLAGS="-Dasm=__asm"
-OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch"
+LDFLAGS="-arch ${ARCH}"
+CFLAGS="$COMMON_FLAGS -std=c99"
+CPPFLAGS="$COMMON_FLAGS -Dasm=__asm"
+OBJCFLAGS="$COMMON_FLAGS -std=c99 -x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch"
 #Force install script to use -C so that header files don't get re-written if not changed.
 INSTALL_DATA="ginstall -C"
 
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
index e46939b25..ab2f403a3 160000
--- a/submodules/externals/polarssl
+++ b/submodules/externals/polarssl
@@ -1 +1 @@
-Subproject commit e46939b25c990d825d94c2d526c350a1380db67f
+Subproject commit ab2f403a3e0ec91257f0e943129c0eec272f34e8
diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj
index 082a585aa..80bc18154 100644
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@@ -178,8 +178,6 @@
 		225D65821521C009008B2E81 /* scheduler.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CF11F6CF9F00621220 /* scheduler.c */; };
 		225D65831521C009008B2E81 /* sessionset.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D111F6CF9F00621220 /* sessionset.c */; };
 		225D65841521C009008B2E81 /* str_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D311F6CF9F00621220 /* str_utils.c */; };
-		225D65851521C009008B2E81 /* stun.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D411F6CF9F00621220 /* stun.c */; };
-		225D65861521C009008B2E81 /* stun_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D511F6CF9F00621220 /* stun_udp.c */; };
 		225D65871521C009008B2E81 /* telephonyevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D711F6CF9F00621220 /* telephonyevents.c */; };
 		225D65881521C009008B2E81 /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6F211F6CF9F00621220 /* utils.c */; };
 		225D65B81521C009008B2E81 /* netsim.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23D145710540035B0D0 /* netsim.c */; };
@@ -346,14 +344,17 @@
 		F02538F919794908002C30F3 /* flowcontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = F02538F819794908002C30F3 /* flowcontrol.c */; };
 		F02538FB1979491B002C30F3 /* videostarter.c in Sources */ = {isa = PBXBuildFile; fileRef = F02538FA1979491B002C30F3 /* videostarter.c */; };
 		F0340ADD1A6D13BD002E4BF1 /* ms_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F0340ADC1A6D13BD002E4BF1 /* ms_srtp.c */; };
-		F0340ADF1A6D13FF002E4BF1 /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F0340ADE1A6D13FF002E4BF1 /* zrtp.c */; };
 		F0497F021A1652F100B67112 /* mediastreamer2_neon_tester.c in Sources */ = {isa = PBXBuildFile; fileRef = F0ED9B981A164D7200A788CE /* mediastreamer2_neon_tester.c */; };
-		F0497F0C1A1B483E00B67112 /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F0497F0B1A1B483E00B67112 /* zrtp.c */; };
 		F0497F0E1A1B4C1700B67112 /* mediastreamer2_tester_ios.m in Sources */ = {isa = PBXBuildFile; fileRef = F0497F0D1A1B4C1700B67112 /* mediastreamer2_tester_ios.m */; };
 		F0497F131A1C9E9C00B67112 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2CA177AC70900C40726 /* mediastreamViewController.xib */; };
 		F0497F141A1C9EA000B67112 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C8177AC70900C40726 /* MainWindow.xib */; };
 		F0497F161A1C9F8700B67112 /* mediastream-tester-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = F0497F151A1C9F8700B67112 /* mediastream-tester-Info.plist */; };
 		F04D51EE1A08E638004DD530 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = F04D51ED1A08E638004DD530 /* common.c */; };
+		F08272D31A7F892700BB6004 /* extremum.c in Sources */ = {isa = PBXBuildFile; fileRef = F08272D21A7F892700BB6004 /* extremum.c */; };
+		F08272D61A7F895400BB6004 /* stun_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = F08272D41A7F895400BB6004 /* stun_udp.c */; };
+		F08272D71A7F895400BB6004 /* stun.c in Sources */ = {isa = PBXBuildFile; fileRef = F08272D51A7F895400BB6004 /* stun.c */; };
+		F08272DA1A7F898200BB6004 /* dtls_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F08272D81A7F898200BB6004 /* dtls_srtp.c */; };
+		F08272DB1A7F898200BB6004 /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F08272D91A7F898200BB6004 /* zrtp.c */; };
 		F0BA0A8D1A24D4C900F68203 /* mediastreamer2_tester.c in Sources */ = {isa = PBXBuildFile; fileRef = F0ED99201A1645C200A788CE /* mediastreamer2_tester.c */; };
 		F0BA0A8E1A24D4DE00F68203 /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84016D9268D00EF1BEC /* nowebcam.c */; };
 		F0ED99131A16456500A788CE /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0ED99121A16456500A788CE /* libcunit.a */; };
@@ -420,13 +421,11 @@
 		F0ED998C1A16464D00A788CE /* chimes_48000_stereo.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99281A1645C200A788CE /* chimes_48000_stereo.wav */; };
 		F0ED998D1A16464D00A788CE /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99171A1645C200A788CE /* Makefile.am */; };
 		F0ED998E1A16464D00A788CE /* bird_44100_stereo.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99271A1645C200A788CE /* bird_44100_stereo.wav */; };
-		F0ED998F1A16464D00A788CE /* hello_pcmu_h264.mkv in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99301A1645C200A788CE /* hello_pcmu_h264.mkv */; };
 		F0ED99901A16464D00A788CE /* hello8000-1s.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED992B1A1645C200A788CE /* hello8000-1s.wav */; };
 		F0ED99911A16464D00A788CE /* mediastream-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2CC177AC70900C40726 /* mediastream-Info.plist */; };
 		F0ED99921A16464D00A788CE /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2E0177ACF5700C40726 /* nowebcamCIF.jpg */; };
 		F0ED99931A16464D00A788CE /* piano_8000_stereo.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99341A1645C200A788CE /* piano_8000_stereo.wav */; };
 		F0ED99941A16464D00A788CE /* hello16000.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED992A1A1645C200A788CE /* hello16000.wav */; };
-		F0ED99951A16464D00A788CE /* hello_opus_h264.mkv in Resources */ = {isa = PBXBuildFile; fileRef = F0ED992E1A1645C200A788CE /* hello_opus_h264.mkv */; };
 		F0ED99961A16464D00A788CE /* hello_pcmu.mka in Resources */ = {isa = PBXBuildFile; fileRef = F0ED992F1A1645C200A788CE /* hello_pcmu.mka */; };
 		F0ED99971A16464D00A788CE /* hello_opus.mka in Resources */ = {isa = PBXBuildFile; fileRef = F0ED992D1A1645C200A788CE /* hello_opus.mka */; };
 		F0ED99981A16464D00A788CE /* arpeggio_8000_mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = F0ED99261A1645C200A788CE /* arpeggio_8000_mono.wav */; };
@@ -629,8 +628,6 @@
 		222CA6D011F6CF9F00621220 /* scheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scheduler.h; sourceTree = "<group>"; };
 		222CA6D111F6CF9F00621220 /* sessionset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sessionset.c; sourceTree = "<group>"; };
 		222CA6D311F6CF9F00621220 /* str_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = str_utils.c; sourceTree = "<group>"; };
-		222CA6D411F6CF9F00621220 /* stun.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun.c; sourceTree = "<group>"; };
-		222CA6D511F6CF9F00621220 /* stun_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun_udp.c; sourceTree = "<group>"; };
 		222CA6D611F6CF9F00621220 /* system */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = system; sourceTree = "<group>"; };
 		222CA6D711F6CF9F00621220 /* telephonyevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = telephonyevents.c; sourceTree = "<group>"; };
 		222CA6F211F6CF9F00621220 /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
@@ -765,11 +762,14 @@
 		F02538F819794908002C30F3 /* flowcontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = flowcontrol.c; sourceTree = "<group>"; };
 		F02538FA1979491B002C30F3 /* videostarter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videostarter.c; sourceTree = "<group>"; };
 		F0340ADC1A6D13BD002E4BF1 /* ms_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ms_srtp.c; sourceTree = "<group>"; };
-		F0340ADE1A6D13FF002E4BF1 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = "<group>"; };
-		F0497F0B1A1B483E00B67112 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = "<group>"; };
 		F0497F0D1A1B4C1700B67112 /* mediastreamer2_tester_ios.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamer2_tester_ios.m; sourceTree = "<group>"; };
 		F0497F151A1C9F8700B67112 /* mediastream-tester-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-tester-Info.plist"; sourceTree = "<group>"; };
 		F04D51ED1A08E638004DD530 /* common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = common.c; path = tools/common.c; sourceTree = "<group>"; };
+		F08272D21A7F892700BB6004 /* extremum.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extremum.c; sourceTree = "<group>"; };
+		F08272D41A7F895400BB6004 /* stun_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun_udp.c; sourceTree = "<group>"; };
+		F08272D51A7F895400BB6004 /* stun.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stun.c; sourceTree = "<group>"; };
+		F08272D81A7F898200BB6004 /* dtls_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtls_srtp.c; sourceTree = "<group>"; };
+		F08272D91A7F898200BB6004 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = "<group>"; };
 		F0ED99121A16456500A788CE /* libcunit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcunit.a; path = "../liblinphone-sdk/apple-darwin/lib/libcunit.a"; sourceTree = "<group>"; };
 		F0ED99171A1645C200A788CE /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
 		F0ED99181A1645C200A788CE /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
@@ -792,9 +792,7 @@
 		F0ED992B1A1645C200A788CE /* hello8000-1s.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = "hello8000-1s.wav"; sourceTree = "<group>"; };
 		F0ED992C1A1645C200A788CE /* hello8000.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = hello8000.wav; sourceTree = "<group>"; };
 		F0ED992D1A1645C200A788CE /* hello_opus.mka */ = {isa = PBXFileReference; lastKnownFileType = file; path = hello_opus.mka; sourceTree = "<group>"; };
-		F0ED992E1A1645C200A788CE /* hello_opus_h264.mkv */ = {isa = PBXFileReference; lastKnownFileType = file; path = hello_opus_h264.mkv; sourceTree = "<group>"; };
 		F0ED992F1A1645C200A788CE /* hello_pcmu.mka */ = {isa = PBXFileReference; lastKnownFileType = file; path = hello_pcmu.mka; sourceTree = "<group>"; };
-		F0ED99301A1645C200A788CE /* hello_pcmu_h264.mkv */ = {isa = PBXFileReference; lastKnownFileType = file; path = hello_pcmu_h264.mkv; sourceTree = "<group>"; };
 		F0ED99311A1645C200A788CE /* laserrocket_16000_mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = laserrocket_16000_mono.wav; sourceTree = "<group>"; };
 		F0ED99321A1645C200A788CE /* nylon_48000_mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = nylon_48000_mono.wav; sourceTree = "<group>"; };
 		F0ED99331A1645C200A788CE /* owl_44100_mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = owl_44100_mono.wav; sourceTree = "<group>"; };
@@ -1113,6 +1111,7 @@
 				222CA6C211F6CF9F00621220 /* ortp.c */,
 				222CA6C311F6CF9F00621220 /* payloadtype.c */,
 				222CA6C411F6CF9F00621220 /* port.c */,
+				F08272D21A7F892700BB6004 /* extremum.c */,
 				222CA6C511F6CF9F00621220 /* posixtimer.c */,
 				222CA6C611F6CF9F00621220 /* rtcp.c */,
 				F02538F2197948BE002C30F3 /* rtcp_fb.c */,
@@ -1130,8 +1129,6 @@
 				222CA6D011F6CF9F00621220 /* scheduler.h */,
 				222CA6D111F6CF9F00621220 /* sessionset.c */,
 				222CA6D311F6CF9F00621220 /* str_utils.c */,
-				222CA6D411F6CF9F00621220 /* stun.c */,
-				222CA6D511F6CF9F00621220 /* stun_udp.c */,
 				222CA6D611F6CF9F00621220 /* system */,
 				222CA6D711F6CF9F00621220 /* telephonyevents.c */,
 				222CA6F211F6CF9F00621220 /* utils.c */,
@@ -1270,6 +1267,8 @@
 				F0ED9B941A1649C700A788CE /* qosanalyzer.h */,
 				223CA85F16D9268D00EF1BEC /* qualityindicator.c */,
 				223CA86016D9268D00EF1BEC /* rfc2429.h */,
+				F08272D41A7F895400BB6004 /* stun_udp.c */,
+				F08272D51A7F895400BB6004 /* stun.c */,
 				223CA86116D9268D00EF1BEC /* rfc3984.c */,
 				223CA86216D9268D00EF1BEC /* ringstream.c */,
 				223CA86316D9268D00EF1BEC /* scaler.c */,
@@ -1278,8 +1277,6 @@
 				223CA86616D9268D00EF1BEC /* videostream.c */,
 				F02538E71979481D002C30F3 /* vp8rtpfmt.c */,
 				F02538E81979481D002C30F3 /* vp8rtpfmt.h */,
-				F0340ADE1A6D13FF002E4BF1 /* zrtp.c */,
-				F0497F0B1A1B483E00B67112 /* zrtp.c */,
 			);
 			path = voip;
 			sourceTree = "<group>";
@@ -1317,6 +1314,8 @@
 			isa = PBXGroup;
 			children = (
 				F0340ADC1A6D13BD002E4BF1 /* ms_srtp.c */,
+				F08272D81A7F898200BB6004 /* dtls_srtp.c */,
+				F08272D91A7F898200BB6004 /* zrtp.c */,
 			);
 			path = crypto;
 			sourceTree = "<group>";
@@ -1357,9 +1356,7 @@
 				F0ED992B1A1645C200A788CE /* hello8000-1s.wav */,
 				F0ED992C1A1645C200A788CE /* hello8000.wav */,
 				F0ED992D1A1645C200A788CE /* hello_opus.mka */,
-				F0ED992E1A1645C200A788CE /* hello_opus_h264.mkv */,
 				F0ED992F1A1645C200A788CE /* hello_pcmu.mka */,
-				F0ED99301A1645C200A788CE /* hello_pcmu_h264.mkv */,
 				F0ED99311A1645C200A788CE /* laserrocket_16000_mono.wav */,
 				F0ED99321A1645C200A788CE /* nylon_48000_mono.wav */,
 				F0ED99331A1645C200A788CE /* owl_44100_mono.wav */,
@@ -1829,13 +1826,11 @@
 				F0ED998C1A16464D00A788CE /* chimes_48000_stereo.wav in Resources */,
 				F0ED998D1A16464D00A788CE /* Makefile.am in Resources */,
 				F0ED998E1A16464D00A788CE /* bird_44100_stereo.wav in Resources */,
-				F0ED998F1A16464D00A788CE /* hello_pcmu_h264.mkv in Resources */,
 				F0ED99901A16464D00A788CE /* hello8000-1s.wav in Resources */,
 				F0ED99911A16464D00A788CE /* mediastream-Info.plist in Resources */,
 				F0ED99921A16464D00A788CE /* nowebcamCIF.jpg in Resources */,
 				F0ED99931A16464D00A788CE /* piano_8000_stereo.wav in Resources */,
 				F0ED99941A16464D00A788CE /* hello16000.wav in Resources */,
-				F0ED99951A16464D00A788CE /* hello_opus_h264.mkv in Resources */,
 				F0ED99961A16464D00A788CE /* hello_pcmu.mka in Resources */,
 				F0ED99971A16464D00A788CE /* hello_opus.mka in Resources */,
 				F0ED99981A16464D00A788CE /* arpeggio_8000_mono.wav in Resources */,
@@ -1888,10 +1883,9 @@
 				225D65821521C009008B2E81 /* scheduler.c in Sources */,
 				225D65831521C009008B2E81 /* sessionset.c in Sources */,
 				225D65841521C009008B2E81 /* str_utils.c in Sources */,
-				225D65851521C009008B2E81 /* stun.c in Sources */,
-				225D65861521C009008B2E81 /* stun_udp.c in Sources */,
 				225D65871521C009008B2E81 /* telephonyevents.c in Sources */,
 				225D65881521C009008B2E81 /* utils.c in Sources */,
+				F08272D31A7F892700BB6004 /* extremum.c in Sources */,
 				225D65B81521C009008B2E81 /* netsim.c in Sources */,
 				22405EE51600671D00B92522 /* logging.c in Sources */,
 				22405EE61600671D00B92522 /* rtpprofile.c in Sources */,
@@ -1927,6 +1921,8 @@
 				22C8D0AD1769F8FF00DAFB4E /* tonedetector.c in Sources */,
 				22C8D0AE1769F8FF00DAFB4E /* ulaw.c in Sources */,
 				22C8D0B71769F8FF00DAFB4E /* itc.c in Sources */,
+				F08272DB1A7F898200BB6004 /* zrtp.c in Sources */,
+				F08272DA1A7F898200BB6004 /* dtls_srtp.c in Sources */,
 				22C8D0B81769F8FF00DAFB4E /* join.c in Sources */,
 				22C8D0B91769F8FF00DAFB4E /* msrtp.c in Sources */,
 				22C8D0BA1769F8FF00DAFB4E /* tee.c in Sources */,
@@ -1939,6 +1935,7 @@
 				22C8D0C01769F8FF00DAFB4E /* kiss_fftr.c in Sources */,
 				22C8D0C11769F8FF00DAFB4E /* opengles_display.c in Sources */,
 				22C8D0C21769F8FF00DAFB4E /* shaders.c in Sources */,
+				F08272D61A7F895400BB6004 /* stun_udp.c in Sources */,
 				22C8D0C31769F8FF00DAFB4E /* extdisplay.c in Sources */,
 				22C8D0C41769F8FF00DAFB4E /* h264dec.c in Sources */,
 				22C8D0C51769F8FF00DAFB4E /* ioscapture.m in Sources */,
@@ -1957,7 +1954,6 @@
 				22C8D0D11769F8FF00DAFB4E /* bitratecontrol.c in Sources */,
 				22C8D0D21769F8FF00DAFB4E /* bitratedriver.c in Sources */,
 				22C8D0D31769F8FF00DAFB4E /* ice.c in Sources */,
-				F0340ADF1A6D13FF002E4BF1 /* zrtp.c in Sources */,
 				22C8D0D41769F8FF00DAFB4E /* layouts.c in Sources */,
 				22C8D0D51769F8FF00DAFB4E /* mediastream.c in Sources */,
 				22C8D0D61769F8FF00DAFB4E /* msvideo.c in Sources */,
@@ -1974,6 +1970,7 @@
 				22C8D0E01769F8FF00DAFB4E /* msopus.c in Sources */,
 				22C8D0ED176A079600DAFB4E /* aac-eld.c in Sources */,
 				1561A555178D9C71006B4B2F /* ioshardware.m in Sources */,
+				F08272D71A7F895400BB6004 /* stun.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2013,7 +2010,6 @@
 				F0ED995E1A16464D00A788CE /* mediastreamViewController.m in Sources */,
 				F0ED995F1A16464D00A788CE /* mediastreamer2_sound_card_tester.c in Sources */,
 				F0ED99601A16464D00A788CE /* mediastreamer2_framework_tester.c in Sources */,
-				F0497F0C1A1B483E00B67112 /* zrtp.c in Sources */,
 				F0ED99611A16464D00A788CE /* mediastreamer2_tester_private.c in Sources */,
 				F0ED99631A16464D00A788CE /* common.c in Sources */,
 				F0497F0E1A1B4C1700B67112 /* mediastreamer2_tester_ios.m in Sources */,
diff --git a/submodules/linphone b/submodules/linphone
index b4dc7b386..2c7b9f2cf 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b4dc7b3868a6fe6f5aa9ece5c08d28393ba0e8dd
+Subproject commit 2c7b9f2cf256baaa7905eb2825c5db5fd19bb149
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 394ccd39a..6c2cf04b5 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 394ccd39acc5671442bd966a54feab39518e5d99
+Subproject commit 6c2cf04b56b226be7bbc4f0ebe47fe937806ac73
diff --git a/submodules/mssilk b/submodules/mssilk
index 7bd277836..dcb4798df 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit 7bd2778369432e865c84259feb82a107196397ed
+Subproject commit dcb4798df328186b3d177d10af5145aafed8352e