Merge remote-tracking branch 'origin/master' into persona

package.json

@@ -45,8 +45,8 @@
     "nodebb-plugin-mentions": "^0.11.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
     "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^1.0.6",
-    "nodebb-theme-vanilla": "^1.0.28",
+    "nodebb-theme-lavender": "^1.0.22",
+    "nodebb-theme-vanilla": "^1.0.65",
     "nodebb-widget-essentials": "~0.2.12",
     "nodebb-rewards-essentials": "^0.0.1",
     "npm": "^2.1.4",

src/views/partials/requirejs-config.tpl

@@ -0,0 +1,12 @@
+<script>
+	require.config({
+		baseUrl: "{relative_path}/src/modules",
+		waitSeconds: 3,
+		urlArgs: "{cache-buster}",
+		paths: {
+			'forum': '../forum',
+			'vendor': '../../vendor',
+			'mousetrap': '../../bower/mousetrap/mousetrap'
+		}
+	});
+</script>