Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-17 522bede75fce4a0e3a7d2c7eff1eee198b900a22

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

@@ -32,6 +32,7 @@
$module['template']  = 'dashboard.tpl.htm';
$module['startpage']  = 'dashboard/dashboard.php';
$module['tab_width']    = '';
$module['order']    = '1';

//$items = array();
//