Merge remote-tracking branch 'snipe-it-upstream/develop' into develop

.public/css/dist/blue.png

.public/css/dist/blue@2x.png

npm-shrinkwrap.json

package.json

public/css/AdminLTE.css

public/css/AdminLTE.css.map

public/css/AdminLTE.min.css

public/css/all.47a3626f2a026645fe48f025aacc900f.css

public/css/all.62471b1dabf4426689e067404cda00a2.css

public/css/all.c320a5e511c1340ea16bc7facdbdb57b.css

public/css/all.css

public/css/app.47a3626f2a026645fe48f025aacc900f.css

public/css/app.62471b1dabf4426689e067404cda00a2.css

public/css/app.css.map

public/css/blue.png

public/css/blue@2x.png

public/css/bootstrap-table.css

public/css/bootstrap-tables-sticky-header.css

public/css/bootstrap.css

public/css/bootstrap.css.map