Rebase with trunk and fix conflicts

Author: salimbraksa

Podfile.lock

@@ -619,6 +619,8 @@ DEPENDENCIES:
   - ZIPFoundation (~> 0.9.8)
 
 SPEC REPOS:
+  https://github.com/wordpress-mobile/cocoapods-specs.git:
+    - WordPressAuthenticator
   trunk:
     - Alamofire
     - AlamofireImage
@@ -890,6 +892,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
 
-PODFILE CHECKSUM: e08eecc6737d45cb8b10dc6626062ec4edadf6c9
+PODFILE CHECKSUM: 5bbd60117a2e84e05ac8ac2d86a72165075ca05b
 
 COCOAPODS: 1.11.2