Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

 interface/web/tools/user_settings.php

@@ -44,10 +44,6 @@
//* Check permissions for module
$app->auth->check_module_permissions('tools');

if($_SESSION['s']['user']['typ'] == 'admin') {
   $app->auth->check_security_permissions('admin_allow_new_admin');
}

// Loading classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');