Merge branch 'master' into encryption_improved_error_messages_4617

.gitignore

apps/files/ajax/delete.php

apps/files/ajax/getstoragestats.php

apps/files/ajax/list.php

apps/files/ajax/rawlist.php

apps/files/ajax/upload.php

apps/files/appinfo/app.php

apps/files/appinfo/register_command.php

apps/files/command/scan.php

apps/files/console/scan.php

apps/files/css/files.css

apps/files/css/upload.css

apps/files/index.php

apps/files/js/file-upload.js

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/js/jquery.fileupload.js

apps/files/js/jquery.iframe-transport.js

apps/files/l10n/ach.php