Merge branch 'develop' into issue-1574

diff --cc include/items.php
Simple merge

diff --cc view/theme/quattro/quattro.less
index 56eab54cc96409442bc85a559ec8c9d6b7988ae0,dded1514a54e81d41fd4c023661311a82a69fdaf..480effd501d5a6aace92a0beff0cba7778cb5645
--- 1/view/theme/quattro/quattro.less
--- 2/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@@ -144,8 -140,9 +144,8 @@@ header 
                #logo-text { font-size: 22px }
        }
  }
 -
  /* nav */
- nav {
+ nav { 
        width: 100%; height: 32px;
        position: fixed; left: 0px; top: 0px;
        padding: 0px;
@@@ -302,10 -299,8 +302,10 @@@ ul.menu-popup 
  }
  
  
 +
 +
  /* aside 230px*/
- aside {
+ aside { 
        display: table-cell;
        vertical-align: top;
        width: 200px;
@@@ -1200,10 -1190,9 +1197,10 @@@ ul.tabs 
                display: block;
                margin-left: 200px;
                color: @FieldHelpColor;
- 
+               
        }
  
 +
        .onoff {
                float: left;
                width: 80px;