Merge branch 'master' into 'master'

company name for login-page

See merge request !239

interface/web/login/index.php

@@ -312,6 +312,7 @@ if($error != ''){
 }
 
 $app->load('getconf');
+$sys_config = $app->getconf->get_global_config('misc');
 
 $security_config = $app->getconf->get_security_config('permissions');
 if($security_config['password_reset_allowed'] == 'yes') {