Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-13 c420e715c5bf53527b5828b0de3fa3b52bdff4d1

 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();
//