Merge remote-tracking branch 'origin/master' into develop

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

# Conflicts:
#	config/permissions.php

config/permissions.php

@@ -6,6 +6,7 @@
  |--------------------------------------------------------------------------
 */
 
+
 return [
 
     'Global' => [
@@ -97,6 +98,7 @@ return [
             'display'    => true,
         ],
 
+
         [
             'permission' => 'assets.view.requestable',
             'label'      => 'View Requestable Assets',
@@ -178,6 +180,7 @@ return [
         ],
     ],
 
+
     'Licenses' => [
         [
             'permission' => 'licenses.view',
@@ -223,6 +226,7 @@ return [
         ],
     ],
 
+
     'Components' => [
         [
             'permission' => 'components.view',
@@ -288,13 +292,6 @@ return [
             'note'       => '',
             'display'    => true,
         ],
-
-        [
-            'permission' => 'kits.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
-            'display'    => true,
-        ],
     ],
 
     'Users' => [
@@ -488,6 +485,7 @@ return [
         ],
     ],
 
+
     'Manufacturers' => [
         [
             'permission' => 'manufacturers.view',
@@ -596,6 +594,9 @@ return [
         ],
     ],
 
+
+
+
     'Self' => [
         [
             'permission' => 'self.two_factor',