Merge branch 'master' of https://github.com/BookStackApp/BookStack

Conflicts:
	resources/assets/js/vues/vues.js

diff --combined resources/assets/js/vues/vues.js
index e5ab50c4da9b371f267c95b3ed95d578b9293f4d,a70d32009a04a6747f68a4f4daf06d67b8ed31c2..d4c4c4574645b8136900fbd95a5691692acf536a
--- 1/resources/assets/js/vues/vues.js
--- 2/resources/assets/js/vues/vues.js
+++ b/resources/assets/js/vues/vues.js
@@@ -6,19 -6,19 +6,20 @@@ function exists(id) 
  
  let vueMapping = {
      'search-system': require('./search'),
-     'entity-dashboard': require('./entity-search'),
+     'entity-dashboard': require('./entity-dashboard'),
      'code-editor': require('./code-editor'),
      'image-manager': require('./image-manager'),
      'tag-manager': require('./tag-manager'),
+     'attachment-manager': require('./attachment-manager'),
 +    'page-comments': require('./page-comments')
  };
  
  window.vues = {};
  
- Object.keys(vueMapping).forEach(id => {
-     if (exists(id)) {
-         let config = vueMapping[id];
-         config.el = '#' + id;
-         window.vues[id] = new Vue(config);
-     }
- });
+ let ids = Object.keys(vueMapping);
+ for (let i = 0, len = ids.length; i < len; i++) {
+     if (!exists(ids[i])) continue;
+     let config = vueMapping[ids[i]];
+     config.el = '#' + ids[i];
+     window.vues[ids[i]] = new Vue(config);
+ }