Merge branch 'master' into 'master'

Marius Cramer

2015-01-21 c0138f5488dc19898c9e6c2df6c6264ee618e77c

 interface/web/admin/server_php_edit.php

@@ -43,6 +43,7 @@

//* Check permissions for module
$app->auth->check_module_permissions('admin');
$app->auth->check_security_permissions('admin_allow_server_php');

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