Merge branch 'master' into INF-7625

Author: Matt Smith

README.md

@@ -61,4 +61,4 @@ With security in mind Google has limited the Chrome browser to only read and wri
 AWS calls this 'session duration'. The default session duration is 1 hour. The maximum session duration is configured in AWS IAM as an attribute of the IAM Role. Your IDP might be configured to pass along an additional SAML claim which requests to apply a custom session duration. This value can be configured to be higher than the default of 1 hour. However, this can never be higher than the configured maximum session duration on the IAM Role as this will result in an error.
 
 4. Create a symlink to your .aws directory
-TODO
+TODO

manifest.json

@@ -16,7 +16,9 @@
   "background": {
     "service_worker": "background/script.js"
   },
-  "options_page": "options/options.html",
+  "options_ui": {
+    "page": "options/options.html"
+  },
   "permissions": [
     "webRequest",
     "storage",