merge master into filesystem

.gitignore

apps/files/ajax/timezone.php

apps/files/css/files.css

apps/files/download.php

apps/files/index.php

apps/files/js/files.js

apps/files/js/keyboardshortcuts.js

apps/files/js/timezone.js

apps/files/l10n/da.php

apps/files/l10n/mk.php

apps/files/l10n/ru_RU.php

apps/files/l10n/th_TH.php

apps/files/templates/admin.php

apps/files/templates/index.php

apps/files_encryption/l10n/mk.php

apps/files_encryption/settings.php

apps/files_encryption/templates/settings.php

apps/files_external/l10n/da.php

apps/files_external/l10n/de.php

apps/files_external/l10n/de_DE.php