Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

 interface/web/admin/remote_user_edit.php

@@ -13,6 +13,9 @@
   die;
}

$app->auth->check_module_permissions('admin');
$app->auth->check_security_permissions('admin_allow_remote_users');

// Disable this function in demo mode
if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');