Merge remote-tracking branch 'origin/version-1.8.3' into v2

# Conflicts:
#	app/FileManagerFolder.php
#	app/Http/Controllers/AppFunctionsController.php
#	app/Http/Controllers/Auth/AuthController.php
#	app/Http/Controllers/FileManager/BrowseController.php
#	app/Http/Controllers/General/SetupWizardController.php
#	app/Http/Controllers/General/UpgradeAppController.php
#	app/Http/Controllers/Sharing/FileSharingController.php
#	app/Http/helpers.php
#	app/Setting.php
#	composer.lock
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/components/Others/Forms/FormLabel.vue
#	resources/js/store/modules/app.js
#	resources/js/views/Admin.vue
#	resources/js/views/Mobile/AdminMobileMenu.vue
#	resources/js/views/Shared/SharedPage.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/crawler/og-view.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	routes/api.php
#	routes/web.php

resources/js/components/Others/Forms/FormLabel.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="form-label">
-        <edit-2-icon size="22" class="icon text-theme" />
+        <edit-2-icon v-if="!icon" size="22" class="icon text-theme" />
+        <settings-icon v-if="icon === 'settings'" size="22" class="icon text-theme" />
         <b class="label">
             <slot></slot>
         </b>
@@ -8,12 +9,14 @@
 </template>
 
 <script>
-    import { Edit2Icon } from 'vue-feather-icons'
+    import { Edit2Icon, SettingsIcon } from 'vue-feather-icons'
 
     export default {
         name: 'FormLabel',
+        props: ['icon'],
         components: {
-            Edit2Icon
+            Edit2Icon,
+            SettingsIcon
         }
     }
 </script>
@@ -30,7 +33,7 @@
         .icon {
             margin-right: 10px;
 
-            path {
+            path, circle {
                 color: inherit;
             }
         }