Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/middleware/AuthCheck.php

@@ -19,7 +19,7 @@ class AuthCheck implements MiddlewareInterface
             return $handler($request);
         } else {
             try {
-                $authHeader = $request->header('Authorization');
+                $authHeader = $request->header('Fdesk-Auth-Token');
                 if (!$authHeader || !preg_match('/Bearer\s(\S+)/', $authHeader, $matches)) {
                     $body = [
                         'status'  => 'fail',