merge master into storagestatistics-reuse

.gitignore

.jshintrc

apps/files/ajax/newfile.php

apps/files/ajax/newfolder.php

apps/files/ajax/upload.php

apps/files/appinfo/remote.php

apps/files/css/files.css

apps/files/index.php

apps/files/js/admin.js

apps/files/js/file-upload.js

apps/files/js/fileactions.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/js/upgrade.js

apps/files/js/upload.js

apps/files/lib/app.php

apps/files/lib/helper.php

apps/files/templates/index.php

apps/files/tests/ajax_rename.php

apps/files/tests/js/fileactionsSpec.js