Merge in master

diff --cc apps/files_encryption/appinfo/app.php
index 3bdf6829a9b088563b622d2371c4c1a8b42d2125,f7b2140b580afa15b02923ec1f3ac0d8f91b5e5e..bf16fec3aea0d60678d0a26d8121c9cbd0413868
--- 1/apps/files_encryption/appinfo/app.php
--- 2/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@@ -1,13 -1,12 +1,13 @@@
  <?php
  
- OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'apps/files_encryption/lib/crypt.php';
- OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'apps/files_encryption/hooks/hooks.php';
- OC::$CLASSPATH['OCA\Encryption\Util'] = 'apps/files_encryption/lib/util.php';
- OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'apps/files_encryption/lib/keymanager.php';
- OC::$CLASSPATH['OCA\Encryption\Stream'] = 'apps/files_encryption/lib/stream.php';
- OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'apps/files_encryption/lib/proxy.php';
- OC::$CLASSPATH['OCA\Encryption\Session'] = 'apps/files_encryption/lib/session.php';
- OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'apps/files_encryption/lib/capabilities.php';
+ OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'files_encryption/lib/crypt.php';
+ OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'files_encryption/hooks/hooks.php';
+ OC::$CLASSPATH['OCA\Encryption\Util'] = 'files_encryption/lib/util.php';
+ OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.php';
+ OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
+ OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
+ OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
++OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
  
  OC_FileProxy::register( new OCA\Encryption\Proxy() );
  

diff --cc apps/files_versions/appinfo/app.php
index 761e0b723afffbde1c927d68eb34f00f975a819e,44d01f5cd5e893d8e62d3010fd6db638301f43cf..9be1c88968249a40398c31259fd7a61929b7dc91
--- 1/apps/files_versions/appinfo/app.php
--- 2/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@@ -1,9 -1,8 +1,9 @@@
  <?php
  
  //require_once 'files_versions/versions.php';
- OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
- OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
- OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'apps/files_versions/lib/capabilities.php';
+ OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php';
+ OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
++OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
  
  OCP\Util::addscript('files_versions', 'versions');