Merge branch 'master' into filesystem

apps/bookmarks/ajax/updateList.php

apps/bookmarks/appinfo/app.php

apps/bookmarks/js/bookmarksearch.js

apps/bookmarks/l10n/xgettextfiles

apps/bookmarks/lib/bookmarks.php

apps/bookmarks/lib/search.php

apps/contacts/ajax/addcard.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/deleteproperty.php

apps/contacts/ajax/setproperty.php

apps/contacts/ajax/showsetproperty.php

apps/contacts/css/styles.css

apps/contacts/lib/app.php

apps/contacts/lib/vcard.php

apps/contacts/photo.php

apps/contacts/templates/part.addcardform.php

apps/contacts/templates/part.details.php

apps/contacts/templates/part.messagebox.php

apps/contacts/templates/part.property.N.php

apps/contacts/templates/part.setpropertyform.php