Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 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.');