Merge master into oc_preview

diff --cc apps/files/js/filelist.js
Simple merge

diff --cc apps/files/js/files.js
Simple merge

diff --cc core/css/styles.css
index db7f01cfebd5ce3a8cdca3863997cfa69997a60e,cf58a3b5f3f5bdd3e6562979ae2323beb5a106a2..18b5f9506f7dd7612513aac209d0f986ad78f877
--- 1/core/css/styles.css
--- 2/core/css/styles.css
+++ b/core/css/styles.css
@@@ -142,8 -145,8 +145,9 @@@ a.disabled, a.disabled:hover, a.disable
  
  .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
  input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
 -#select_all{ margin-top:.4em }
 +
 +
+ 
  /* CONTENT ------------------------------------------------------------------ */
  #controls {
        position:fixed;

diff --cc db_structure.xml
Simple merge

diff --cc lib/template/functions.php
Simple merge