Merge branch 'master' of https://github.com/owncloud/core

diff --cc settings/ajax/apps/ocs.php
index a15b21e17446895ae7ea86c8e7191e0cc3ed7385,b47a67c13bb91644f68607f63b95db44cea9b22c..fb78cc89248471008532c2be7fcc7a8aca3a65d8
--- 1/settings/ajax/apps/ocs.php
--- 2/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@@ -62,4 -62,5 +62,4 @@@ if(is_array($catagoryNames)) 
        }
  }
  
- OCP\JSON::success(array('type' => 'external', 'data' => $apps));
+ OCP\JSON::success(array('type' => 'external', 'data' => $apps));
 -