Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json

app/Observers/AccessoryObserver.php

@@ -4,7 +4,7 @@ namespace App\Observers;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class AccessoryObserver
 {

app/Observers/AssetObserver.php

@@ -5,7 +5,7 @@ namespace App\Observers;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Setting;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 
 class AssetObserver

app/Observers/ComponentObserver.php

@@ -4,7 +4,7 @@ namespace App\Observers;
 
 use App\Models\Actionlog;
 use App\Models\Component;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class ComponentObserver
 {

app/Observers/ConsumableObserver.php

@@ -4,7 +4,7 @@ namespace App\Observers;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class ConsumableObserver
 {

app/Observers/LicenseObserver.php

@@ -4,7 +4,7 @@ namespace App\Observers;
 
 use App\Models\Actionlog;
 use App\Models\License;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class LicenseObserver
 {

app/Observers/UserObserver.php

@@ -4,7 +4,7 @@ namespace App\Observers;
 
 use App\Models\Actionlog;
 use App\Models\User;
-use Auth;
+use Illuminate\Support\Facades\Auth;
 
 class UserObserver
 {