Merge branch 'master' into files_encryption

.gitignore

apps/files/css/files.css

apps/files/templates/index.php

apps/files_versions/ajax/getVersions.php

apps/files_versions/ajax/rollbackVersion.php

apps/files_versions/appinfo/app.php

apps/files_versions/history.php

apps/files_versions/lib/hooks.php

apps/files_versions/lib/versions.php

autotest.cmd

core/css/styles.css

settings/css/settings.css

settings/templates/apps.php

settings/templates/users.php

tests/win32-phpunit.php