Merge branch 'master' into migration

3rdparty/Archive/Tar.php

apps/calendar/ajax/import/import.php

apps/calendar/export.php

apps/contacts/ajax/deletecard.php

apps/contacts/css/contacts.css

apps/contacts/js/contacts.js

apps/contacts/templates/part.contact.php

apps/files_archive/appinfo/app.php

apps/files_archive/appinfo/info.xml

apps/files_archive/js/archive.js

apps/files_archive/lib/archive.php

apps/files_archive/lib/storage.php

apps/files_archive/lib/tar.php

apps/files_archive/lib/zip.php

apps/files_archive/tests/archive.php

apps/files_archive/tests/tar.php

apps/files_encryption/appinfo/info.xml

apps/files_external/appinfo/app.php

apps/files_external/appinfo/info.xml

apps/files_external/lib/ftp.php