Merge branch 'master' into subadmin

apps/calendar/ajax/event/new.form.php

apps/calendar/lib/app.php

apps/calendar/lib/object.php

apps/calendar/lib/search.php

apps/contacts/js/contacts.js

apps/contacts/lib/VCFExportPlugin.php

apps/contacts/lib/hooks.php

apps/contacts/lib/vcard.php

apps/files_encryption/lib/cryptstream.php

apps/files_external/lib/smb.php

apps/files_external/tests/ftp.php

apps/files_external/tests/google.php

apps/files_external/tests/smb.php

apps/files_external/tests/swift.php

apps/files_external/tests/webdav.php

apps/files_sharing/sharedstorage.php

apps/files_versions/lib/versions.php

apps/gallery/lib/album.php

apps/gallery/lib/managers.php

apps/gallery/lib/tiles.php