Merge branch 'master' into fixing-998-master

apps/files_sharing/appinfo/app.php

config/config.sample.php

core/ajax/update.php

core/css/styles.css

core/templates/update.php

lib/api.php

lib/app.php

lib/base.php

lib/db.php

lib/filestorage.php

lib/filestorage/local.php

lib/helper.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