Merge branch 'develop' of github.com:snipe/snipe-it into develop

package.json

@@ -16,6 +16,7 @@
     "laravel-elixir-vue-2": "^0.2.0",
     "laravel-elixir-webpack-official": "^1.0.2",
     "lodash": "^4.16.2",
+    "select2": "^4.0.3",
     "vue": "=2.1.6",
     "vue-loader": "^10.0.2",
     "vue-resource": "^1.0.3",

public/build/assets/css/app-d98e951062.css

@@ -14141,7 +14141,7 @@ a.accordion-header {
   padding-left: 15px;
 }
 .control-label.multiline {
-  padding-top: 10;
+  padding-top: 10px;
 }
 .btn-outline {
   color: inherit;
@@ -14343,5 +14343,15 @@ a.logo.no-hover a:hover {
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
+@media print {
+  a[href]:after {
+    content: none;
+  }
+  .tab-content > .tab-pane {
+    display: block !important;
+    opacity: 1 !important;
+    visibility: visible !important;
+  }
+}
 
 /*# sourceMappingURL=app.css.map */

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
-  "assets/css/app.css": "assets/css/app-fc4d2fdcc4.css",
-  "assets/js/all.js": "assets/js/all-5e5715ba54.js"
+  "assets/css/app.css": "assets/css/app-d98e951062.css",
+  "assets/js/all.js": "assets/js/all-1782edec9f.js"
 }