Merge pull request #1053 from owncloud/ocs_api

apps/files_sharing/appinfo/app.php

lib/api.php

lib/app.php

lib/ocs.php

lib/ocs/activity.php

lib/ocs/cloud.php

lib/ocs/config.php

lib/ocs/person.php

lib/ocs/privatedata.php

lib/ocs/result.php

lib/public/api.php

lib/router.php

ocs/routes.php

ocs/v1.php

settings/css/oauth.css

settings/oauth.php

settings/templates/oauth-required-apps.php

settings/templates/oauth.php