fix merge conflicts

apps/calendar/ajax/share/share.php

apps/calendar/templates/settings.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/saveproperty.php

apps/contacts/css/contacts.css

apps/contacts/export.php

apps/contacts/js/contacts.js

apps/contacts/js/jquery.combobox.js

apps/contacts/templates/part.contact.php

apps/contacts/templates/part.edit_address_dialog.php

apps/contacts/templates/part.importaddressbook.php

apps/files/ajax/newfolder.php

apps/files_external/lib/smb.php

apps/files_external/tests/config.php

apps/files_external/tests/smb.php

apps/gallery/ajax/galleryOp.php

apps/gallery/ajax/sharing.php

apps/gallery/ajax/thumbnail.php

apps/gallery/appinfo/database.xml

apps/gallery/appinfo/update.php