fix merge conflicts

apps/files/ajax/move.php

apps/files/js/file-upload.js

apps/files/js/filelist.js

apps/files/js/files.js

apps/files/tests/js/filesSpec.js

apps/files_external/js/settings.js

apps/files_external/lib/config.php

core/css/styles.css

core/js/router.js

core/js/share.js

lib/private/connector/sabre/directory.php

lib/private/connector/sabre/objecttree.php

lib/private/installer.php

lib/private/preview.php

lib/private/preview/movies.php

lib/private/preview/office-cl.php

lib/private/preview/office.php