Merge branch 'develop' into issue/1180_nested_list_fix_rendering

Author: SergioEstevao

Aztec/Classes/Extensions/NSBundle+AztecBundle.swift

@@ -5,7 +5,7 @@ extension Bundle {
         let defaultBundle = Bundle(for: EditorView.self)
         // If installed with CocoaPods, resources will be in WordPress-Aztec-iOS.bundle
         if let bundleURL = defaultBundle.resourceURL,
-            let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("WordPress-Aztec-iOS")) {
+            let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("WordPress-Aztec-iOS.bundle")) {
             return resourceBundle
         }
         // Otherwise, the default bundle is used for resources

Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift

@@ -899,7 +899,7 @@ private extension AttributedStringParser {
             return representationElement.toElementNode()
         }
 
-        return ElementNode(type: .strike)
+        return ElementNode(type: .s)
     }
 
     /// Extracts all of the Code Elements contained within a collection of Attributes.

AztecTests/NSAttributedString/Conversions/AttributedStringParserTests.swift

@@ -134,7 +134,7 @@ class AttributedStringParserTests: XCTestCase {
             XCTFail()
             return
         }
-        XCTAssertEqual(strike.name, Element.strike.rawValue)
+        XCTAssertEqual(strike.name, Element.s.rawValue)
         XCTAssertEqual(strike.children.count, 1)
 
         guard let text = strike.children.first as? TextNode else {

WordPress-Aztec-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.6.2'
+  s.version          = '1.6.3'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.

WordPress-Editor-iOS.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.6.2'
+  s.version          = '1.6.3'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.