Merge branch 'dev' into avoid-jquery

dist/mix-manifest.json

@@ -1,7 +1,7 @@
 {
     "/scripts/aldine.js": "/scripts/aldine.js?id=e7092457ba2f022d10dd",
-    "/styles/aldine.css": "/styles/aldine.css?id=716d4ed2339f151d5cf6",
-    "/styles/editor.css": "/styles/editor.css?id=d4f6396d24781892494e",
+    "/styles/aldine.css": "/styles/aldine.css?id=49380422939b00103dd9",
+    "/styles/editor.css": "/styles/editor.css?id=0471100c6ede7a8c5c99",
     "/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=eadd19411c87b21e88d7",
     "/scripts/page-section.js": "/scripts/page-section.js?id=c83fb9af2087d5248257",
     "/scripts/customizer.js": "/scripts/customizer.js?id=5897af2d5bac7237fb6e",

package.json

@@ -37,8 +37,10 @@
 			"PB_A11y": true,
 			"tinymce": true
 		}
-  },
-  "eslintIgnore": ["assets/scripts/catalog-admin.js"],
+	},
+	"eslintIgnore": [
+		"assets/scripts/catalog-admin.js"
+	],
 	"stylelint": {
 		"extends": "./node_modules/pressbooks-build-tools/config/stylelint.js"
 	},
@@ -61,7 +63,7 @@
 		"pressbooks-build-tools": "^0.13.0"
 	},
 	"dependencies": {
-		"aetna": "^1.0.0-alpha.17",
+		"aetna": "^1.0.0-alpha.20",
 		"isotope-layout": "^3.0.6",
 		"jquery-bridget": "^2.0.1",
 		"js-cookie": "^2.2.0",