search for zeroconf service for 5 secs and click to refresh

Change-Id: I180a9a493e8d8b48461023f15391cdf3f13d1138

12 files changed, 88 insertions, 433 deletions

diff --git a/ios/iosremote/fr.lproj/Localizable.strings b/ios/iosremote/fr.lproj/Localizable.strings
index 9532cc56ac3e..dddb726ff540 100644
--- a/ios/iosremote/fr.lproj/Localizable.strings
+++ b/ios/iosremote/fr.lproj/Localizable.strings
diff --git a/ios/iosremote/iosremote/Communication/CommunicationManager.h b/ios/iosremote/iosremote/Communication/CommunicationManager.h
index f4ca389a3e1c..a0997d5e2572 100644
--- a/ios/iosremote/iosremote/Communication/CommunicationManager.h
+++ b/ios/iosremote/iosremote/Communication/CommunicationManager.h
@@ -58,7 +58,8 @@ typedef enum ConnectionState : NSInteger ConnectionState;
 enum ConnectionState : NSInteger {
     DISCONNECTED,
     CONNECTING,
-    CONNECTED
+    CONNECTED,
+    SEARCHING
 };
 
 @interface CommunicationManager : NSObject
diff --git a/ios/iosremote/iosremote/en.lproj/Localizable.strings b/ios/iosremote/iosremote/en.lproj/Localizable.strings
index 903ef6458436..ef26a373c8aa 100644
--- a/ios/iosremote/iosremote/en.lproj/Localizable.strings
+++ b/ios/iosremote/iosremote/en.lproj/Localizable.strings
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
index cf5bb6334f3c..77117ef7e13a 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard
@@ -27,7 +27,7 @@
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc">
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc">
                                             <rect key="frame" x="246" y="11" width="44" height="22"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                                             <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -514,80 +514,13 @@
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
index 0f59d358cdda..1666875e50fa 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings
diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
index cf5bb6334f3c..77117ef7e13a 100644
--- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard
@@ -27,7 +27,7 @@
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                         </label>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc">
+                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9Mc-gD-acc">
                                             <rect key="frame" x="246" y="11" width="44" height="22"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                                             <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -514,80 +514,13 @@
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
index 58fb37b8dc6e..8c1aa29a428a 100644
--- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard
@@ -516,80 +516,13 @@ Contrôle Distant</string>
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
index 58fb37b8dc6e..8c1aa29a428a 100644
--- a/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard
@@ -516,80 +516,13 @@ Contrôle Distant</string>
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/serverList_vc.m b/ios/iosremote/iosremote/serverList_vc.m
index 9714f378a141..824c19adc5fa 100644
--- a/ios/iosremote/iosremote/serverList_vc.m
+++ b/ios/iosremote/iosremote/serverList_vc.m
@@ -26,10 +26,18 @@
 @property (atomic, strong) NSIndexPath *lastSpinningCellIndex;
 
 @property (nonatomic, strong) NSNetServiceBrowser *serviceBrowser;
+@property (nonatomic, strong) NSTimer *searchLabelTimer;
+@property (nonatomic, strong) NSTimer *searchTimeoutTimer;
+@property (nonatomic, strong) NSString *searchStateText;
+@property (nonatomic)  UITableViewCellSelectionStyle style;
+
 @end
 
 @implementation server_list_vc
 
+@synthesize style = _style;
+@synthesize searchStateText = _searchStateText;
+@synthesize searchLabelTimer = _searchLabelTimer;
 @synthesize center = _center;
 @synthesize comManager = _comManager;
 @synthesize lastSpinningCellIndex = _lastSpinningCellIndex;
@@ -37,6 +45,19 @@
 @synthesize pinValidationObserver = _pinValidationObserver;
 @synthesize serviceBrowser = _serviceBrowser;
 
+#pragma mark - helper
+- (void) setSearchStateText:(NSString *)searchStateText
+{
+    _searchStateText = searchStateText;
+    [self.serverTable reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
+}
+
+- (void) setStyle:(UITableViewCellSelectionStyle)style
+{
+    _style = style;
+    [self.serverTable reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationNone];
+}
+
 #pragma mark - netservice resolve delegate
 -(void) netServiceDidResolveAddress:(NSNetService *)sender
 {
@@ -65,18 +86,56 @@
 
 #pragma mark - bonjour service discovery
 
+-(void) handleSearchTimeout
+{
+    [self.serviceBrowser stop];
+}
+
+-(void) updateSearchLabel
+{
+    static short count = 1;
+    NSString * searchText = NSLocalizedString(@"Searching", nil);
+    for (uint i = 0; i<=count; ++i) {
+        searchText = [searchText stringByAppendingString:@"."];
+    }
+    NSLog(@"Updating count = %u SearchText = %@", count, searchText);
+    self.searchStateText = searchText;
+    count++;
+    count = count % 3;
+}
+
 -(void) netServiceBrowserWillSearch:(NSNetServiceBrowser *)aNetServiceBrowser
 {
     NSLog(@"Will search");
-    UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-    [(UIActivityIndicatorView *)[cell viewWithTag:5] startAnimating];
+    self.comManager.state = SEARCHING;
+    self.searchStateText = NSLocalizedString(@"Searching", nil);
+    [self.searchLabelTimer invalidate];
+    [self.searchTimeoutTimer invalidate];
+    self.searchLabelTimer = [NSTimer scheduledTimerWithTimeInterval:1.0
+                                                           target:self
+                                                         selector:@selector(updateSearchLabel)
+                                                         userInfo:nil
+                                                          repeats:YES];
+    
+    self.searchTimeoutTimer = [NSTimer scheduledTimerWithTimeInterval:5.0
+                                                                   target:self
+                                                                 selector:@selector(handleSearchTimeout)
+                                                                 userInfo:nil
+                                                                  repeats:NO];
+    
+    [[NSRunLoop currentRunLoop] addTimer:self.searchLabelTimer forMode:NSRunLoopCommonModes];
+    self.style = UITableViewCellSelectionStyleNone;
 }
 
 -(void) netServiceBrowserDidStopSearch:(NSNetServiceBrowser *)aNetServiceBrowser
 {
     NSLog(@"End search");
-    UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-    [(UIActivityIndicatorView *)[cell viewWithTag:5] stopAnimating];
+    if (self.comManager.state == SEARCHING)
+        self.comManager.state = DISCONNECTED;
+    [self.searchLabelTimer invalidate];
+    [self.searchTimeoutTimer invalidate];
+    self.searchStateText = NSLocalizedString(@"Click to refresh", nil);
+    self.style = UITableViewCellSelectionStyleBlue;
 }
 
 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didNotSearch:(NSDictionary *)errorDict
@@ -99,8 +158,6 @@
     
     if(!moreComing)
     {
-        UITableViewCell * cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-        [(UIActivityIndicatorView *)[cell viewWithTag:5] stopAnimating];
         [self.tableView reloadData];
     }
 }
@@ -157,6 +214,7 @@
     self.comManager = [CommunicationManager sharedComManager];
     self.serverTable.dataSource = self;
     self.serverTable.delegate = self;
+    _style = UITableViewCellSelectionStyleNone;
     
     [self setTitle:NSLocalizedString(@"Impress Remote", @"App name displayed on navbar")];
     
@@ -239,11 +297,13 @@
 {
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     
+    // Return when browser is still searching...
+    if ([self.comManager.autoDiscoveryServers count] == 0 && indexPath.section == 0 && self.comManager.state == SEARCHING)
+        return;
+    
     // Return when nothing should be done
-    if (self.comManager.state == CONNECTING ||
-        ([self.comManager.autoDiscoveryServers count] == 0 && indexPath.section == 0)) {
+    if (self.comManager.state == CONNECTING)
         return;
-    }
     
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     
@@ -257,6 +317,12 @@
         NSLog(@"Connecting to %@:%@", [[self.comManager.servers objectAtIndex:indexPath.row] serverName], [[self.comManager.servers objectAtIndex:indexPath.row] serverAddress]);
         [self.comManager connectToServer:[self.comManager.servers objectAtIndex:indexPath.row]];
     } else if (indexPath.section == 0){
+        // No discovered server and not searching => in a click to refresh state, so we restart searching process
+        if ([self.comManager.autoDiscoveryServers count] == 0) {
+            [self.serviceBrowser searchForServicesOfType:@"_impressremote._tcp" inDomain:@"local"];
+            [self.serviceBrowser scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+            return;
+        }
         NSLog(@"Connecting to %@", [[self.comManager.autoDiscoveryServers objectAtIndex:indexPath.row] name]);
         [[self.comManager.autoDiscoveryServers objectAtIndex:indexPath.row] resolveWithTimeout:0.0];
     }
@@ -341,19 +407,9 @@
     
     if (indexPath.section == 0){
         if ([self.comManager.autoDiscoveryServers count] == 0){
-            // Looking for one
-            UIActivityIndicatorView *spinner = [[UIActivityIndicatorView alloc]initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-            int vCenter = [cell frame].size.height / 2;
-            int hCenter = [cell frame].size.width / 2;
-            
-            int SPINNER_SIZE = spinner.frame.size.width;
-            [spinner setFrame:CGRectMake(hCenter - SPINNER_SIZE, vCenter - SPINNER_SIZE/2, SPINNER_SIZE, SPINNER_SIZE)];
-            [[cell contentView] addSubview:spinner];
-            
-            [spinner setTag:5];
-            
-            cell.textLabel.text = @"";
-            cell.detailTextLabel.text = @"";
+            cell.textLabel.text = NSLocalizedString(self.searchStateText, nil);
+            cell.textLabel.lineBreakMode = UILineBreakModeClip;
+            cell.selectionStyle = self.style;
         } else {
             id s = [self.comManager.autoDiscoveryServers objectAtIndex:indexPath.row];
             
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
index b845308e0e7c..795640079a80 100644
--- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
+++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard
@@ -514,80 +514,13 @@
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
index b845308e0e7c..795640079a80 100644
--- a/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
+++ b/ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard
@@ -514,80 +514,13 @@
         <image name="timer_clear_btn.png" width="60" height="60"/>
         <image name="timer_start_btn.png" width="60" height="60"/>
     </resources>
-    <classes>
-        <class className="EditableTableViewCell" superclassName="UITableViewCell">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditableTableViewCell.h"/>
-        </class>
-        <class className="LibONavigationController" superclassName="UINavigationController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/LibONavigationController.h"/>
-        </class>
-        <class className="SWRevealViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SWRevealViewController.h"/>
-        </class>
-        <class className="newServerViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/newServerViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="save:"/>
-                <relationship kind="outlet" name="saveButton" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-        <class className="pinValidation_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/pinValidation_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="pinLabel" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="statusLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="server_list_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/server_list_vc.h"/>
-            <relationships>
-                <relationship kind="outlet" name="serverTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="startPresentationAction:"/>
-                <relationship kind="outlet" name="optionsTable" candidateClass="UITableView"/>
-            </relationships>
-        </class>
-        <class className="slideShowPreviewTable_vc_iphone" superclassName="slideShowPreviewTable_vc">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowPreviewTable_vc_iphone.h"/>
-            <relationships>
-                <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
-            </relationships>
-        </class>
-        <class className="slideShowSwipeInList" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShowSwipeInList.h"/>
-        </class>
-        <class className="slideShow_vc" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/slideShow_vc.h"/>
-            <relationships>
-                <relationship kind="action" name="accPointerAction:"/>
-                <relationship kind="action" name="nextSlideAction:"/>
-                <relationship kind="action" name="pointerAction:"/>
-                <relationship kind="action" name="previousSlideAction:"/>
-                <relationship kind="outlet" name="blockingView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="bottomView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="lecturer_notes" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="movingPointer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="notesView" candidateClass="UIView"/>
-                <relationship kind="outlet" name="pointerBtn" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="revealButtonItem" candidateClass="UIBarButtonItem"/>
-                <relationship kind="outlet" name="secondarySlideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="slideNumber" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="slideView" candidateClass="UIImageView"/>
-                <relationship kind="outlet" name="touchPointerImage" candidateClass="UIImageView"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="eIY-4P-1sI"/>
         <segue reference="EWS-Nn-mQc"/>
+        <segue reference="eIY-4P-1sI"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file
diff --git a/ios/iosremote/zh-Hans.lproj/Localizable.strings b/ios/iosremote/zh-Hans.lproj/Localizable.strings
index 836ba6d097eb..487aa09e5832 100644
--- a/ios/iosremote/zh-Hans.lproj/Localizable.strings
+++ b/ios/iosremote/zh-Hans.lproj/Localizable.strings