Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc

 interface/web/tools/lib/module.conf.php

@@ -7,6 +7,7 @@
$module['template']  = 'module.tpl.htm';
$module['startpage']  = 'tools/index.php';
$module['tab_width']    = '60';
$module['order']    = '80';


//**** Change User password