Merge branch 'master' into avater_with_encryption

apps/files/css/files.css

apps/files_encryption/lib/proxy.php

apps/files_external/templates/settings.php

apps/files_sharing/lib/api.php

apps/files_sharing/tests/api.php

lib/private/cache/file.php

lib/private/connector/sabre/directory.php

lib/private/connector/sabre/file.php

lib/private/filechunking.php

lib/private/helper.php

lib/private/user.php

tests/lib/helper.php