Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

 interface/web/client/client_circle_del.php

@@ -39,8 +39,8 @@
* End Form configuration
******************************************/

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

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