Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements

# Conflicts:
#	manifest/manifest.json
#	src/components/SponsorTimeEditComponent.tsx
#	src/config.ts
#	src/content.ts
#	src/types.ts

src/config.ts

@@ -3,6 +3,7 @@ import { Category, CategorySelection, CategorySkipOption, PreviewBarOption, Spon
 
 interface SBConfig {
     userID: string,
+    /** Contains unsubmitted segments that the user has created. */
     segmentTimes: SBMap<string, SponsorTime[]>,
     defaultCategory: Category,
     whitelistedChannels: string[],
@@ -31,8 +32,8 @@ interface SBConfig {
     audioNotificationOnSkip,
     checkForUnlistedVideos: boolean,
     testingServer: boolean,
-    hashPrefix: boolean,
     refetchWhenNotFound: boolean,
+    ytInfoPermissionGranted: boolean,
 
     // What categories should be skipped
     categorySelections: CategorySelection[],
@@ -168,8 +169,8 @@ const Config: SBObject = {
         audioNotificationOnSkip: false,
         checkForUnlistedVideos: false,
         testingServer: false,
-        hashPrefix: true,
         refetchWhenNotFound: true,
+        ytInfoPermissionGranted: false,
 
         categorySelections: [{
             name: "sponsor" as Category,