Merge branch 'master' into feature/feed-wrangler

# Conflicts:
#	Frameworks/Account/Account.swift
#	Frameworks/Account/Account.xcodeproj/project.pbxproj
#	NetNewsWire.xcodeproj/project.pbxproj
#	submodules/RSCore

Mac/Resources/Assets.xcassets/Swipe Images/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkRead.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "checkmark.circle.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkStarred.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "star.fill.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnread.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "circle.fill.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Mac/Resources/Assets.xcassets/Swipe Images/swipeMarkUnstarred.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "star.pdf",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mac/Resources/Assets.xcassets/articleExtractorInactiveDark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ArticleExtractorInactiveDark.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mac/Resources/Assets.xcassets/articleExtractorInactiveLight.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ArticleExtractorInactiveLight.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Mac/Resources/Info.plist

@@ -45,7 +45,7 @@
 	</dict>
 	<key>NSUserActivityTypes</key>
 	<array>
-		<string>com.ranchero.NetNewsWire.ReadArticle</string>
+		<string>ReadArticle</string>
 	</array>
 	<key>NSAppleEventsUsageDescription</key>
 	<string>NetNewsWire communicates with other apps on your Mac when you choose to share an article.</string>
@@ -60,9 +60,9 @@
 	<key>OSAScriptingDefinition</key>
 	<string>NetNewsWire.sdef</string>
 	<key>SUFeedURL</key>
-	<string>https://ranchero.com/downloads/netnewswire-release.xml</string>
+	<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
 	<key>FeedURLForTestBuilds</key>
-	<string>https://ranchero.com/downloads/netnewswire-beta.xml</string>
+	<string>https://ranchero.com/downloads/netnewswire-5.1-beta.xml</string>
 	<key>UserAgent</key>
 	<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
 </dict>

Mac/Resources/NetNewsWire.sdef

@@ -60,8 +60,8 @@
              <element type="account">
                  <cocoa key="accounts"/>
              </element>
-             <element type="feed">
-                 <cocoa key="feeds"/>
+             <element type="webFeed">
+                 <cocoa key="webFeeds"/>
              </element>
          </class>
 
@@ -88,30 +88,30 @@
 			<property name="active" code="Actv" type="boolean" access="rw" description="Whether or not the account is active">
 				<cocoa key="scriptingIsActive"/>
 			</property>
-           	<property name="allFeeds" code="Feds" access="r" description="All feeds, including feeds inside folders">
-                <cocoa key="allFeeds"/>
-                <type type="feed" list="yes"/>
+           	<property name="allWebFeeds" code="Feds" access="r" description="All feeds, including feeds inside folders">
+                <cocoa key="allWebFeeds"/>
+                <type type="webFeed" list="yes"/>
             </property>
             <property name="opml representation" code="OPML" type="text" access="r" description="OPML representation for the account">
                 <cocoa key="opmlRepresentation"/>
             </property>
-            <element type="feed">
-                <cocoa key="feeds"/>
+            <element type="webFeed">
+                <cocoa key="webFeeds"/>
             </element>
             <element type="folder">
                 <cocoa key="folders"/>
             </element>
         </class>
         
-        <class name="feed" code="Feed" plural="feeds" description="An RSS feeds">
-            <cocoa class="ScriptableFeed"/>
+        <class name="webFeed" code="Feed" plural="webFeeds" description="An RSS feed">
+            <cocoa class="ScriptableWebFeed"/>
             <property name="name" code="pnam" type="text" access="r" description="The name of the feed">
                 <cocoa key="name"/>
             </property>
-            <property name="id" code="ID  " type="text" access="r" description="The unique id of the account">
+            <property name="id" code="ID  " type="text" access="r" description="The unique id of the feed">
                 <cocoa key="uniqueId"/>
             </property>
-            <property name="url" code="URL " type="text" access="r" description="The type of the account">
+            <property name="url" code="URL " type="text" access="r" description="The type of the feed">
                 <cocoa key="url"/>
             </property>
             <property name="homepage url" code="HpUr" type="text" access="r" description="url for the feed homepage (optional)">
@@ -164,8 +164,8 @@
             <property name="opml representation" code="OPML" type="text" access="r" description="OPML representation for the folder">
                 <cocoa key="opmlRepresentation"/>
             </property>
-            <element type="feed">
-                <cocoa key="feeds"/>
+            <element type="webFeed">
+                <cocoa key="webFeeds"/>
             </element>
         </class>