Merge branch 'master' into shared-folder-etags

Conflicts:
	apps/files_sharing/appinfo/app.php

diff --cc apps/files_sharing/appinfo/app.php
index f8326db45bb13b53fcac2b30bbadafefe3f8e27d,5b5893abc930c0d2934ec6fa09472796f6d725ac..c9237a4b3a495f6f7a7217b8325f41d539d30248
--- 1/apps/files_sharing/appinfo/app.php
--- 2/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@@ -1,12 -1,11 +1,12 @@@
  <?php
  
- OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
- OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
- OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php";
- OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'apps/files_sharing/lib/updater.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php';
+ OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
+ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
+ OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php';
++OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
  OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
  OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
  OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');

diff --cc lib/public/share.php
Simple merge