Merge branch 'master' into calendar_export

apps/bookmarks/appinfo/migrate.php

apps/contacts/ajax/contacts.php

apps/contacts/ajax/loadphoto.php

apps/contacts/appinfo/migrate.php

apps/contacts/css/contacts.css

apps/contacts/js/contacts.js

apps/contacts/lib/vcard.php

apps/contacts/templates/part.contact.php

apps/contacts/templates/part.contactphoto.php

apps/contacts/templates/part.contacts.php

apps/files_external/lib/amazons3.php

lib/migrate.php

lib/setup.php