Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-28 d1923498c73ceef785748b5464e05d8fe383e5ea

 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