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

# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json

resources/js/router.js

@@ -774,6 +774,17 @@ const routesIndex = [
         },
     },
 ]
+const routesOthers = [
+    {
+        name: 'NotFound',
+        path: '*',
+        component: () =>
+            import(/* webpackChunkName: "chunks/not-found-shared" */ './views/Shared/NotFoundShared'),
+        meta: {
+            requiresAuth: false
+        },
+    },
+]
 
 const router = new Router({
     mode: 'history',
@@ -785,6 +796,7 @@ const router = new Router({
         ...routesIndex,
         ...routesAuth,
         ...routesUser,
+        ...routesOthers,
     ],
     scrollBehavior(to, from, savedPosition) {
         if (savedPosition) {