Merge branch 'master' into files_encryption

Conflicts:
	lib/files/cache/cache.php

diff --cc db_structure.xml
Simple merge

diff --cc lib/files/cache/cache.php
index 3c2649cb1beeaf3a4ab879ac932ab5c24533055a,0617471079b789fe53cfdfa380c70ac8b4a73ea8..1a8435a46fc2206c6ece38698c0861880fecaeb7
--- 1/lib/files/cache/cache.php
--- 2/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@@ -107,7 -107,7 +107,7 @@@ class Cache 
                        $params = array($file);
                }
                $query = \OC_DB::prepare(
-                       'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 -                      'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
++                      'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
                         FROM `*PREFIX*filecache` ' . $where);
                $result = $query->execute($params);
                $data = $result->fetchRow();
@@@ -142,7 -144,7 +145,7 @@@
                $fileId = $this->getId($folder);
                if ($fileId > -1) {
                        $query = \OC_DB::prepare(
-                               'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 -                              'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
++                              'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
                                 FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
                        $result = $query->execute(array($fileId));
                        $files = $result->fetchAll();
@@@ -225,7 -230,7 +231,7 @@@
         * @return array
         */
        function buildParts(array $data) {
-               $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'unencrypted_size', 'etag');
 -              $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag');
++              $fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'unencrypted_size', 'etag');
                $params = array();
                $queryParts = array();
                foreach ($data as $name => $value) {

diff --cc lib/files/view.php
Simple merge