fix merge conflicts

.gitignore

3rdparty/Sabre/DAV/Client.php

apps/bookmarks/ajax/addBookmark.php

apps/bookmarks/ajax/delBookmark.php

apps/bookmarks/ajax/editBookmark.php

apps/bookmarks/lib/bookmarks.php

apps/calendar/appinfo/remote.php

apps/calendar/settings.php

apps/calendar/templates/settings.php

apps/contacts/ajax/addbook.php

apps/contacts/ajax/categories/categoriesfor.php

apps/contacts/ajax/categories/delete.php

apps/contacts/ajax/categories/list.php

apps/contacts/ajax/categories/rescan.php

apps/contacts/ajax/currentphoto.php

apps/contacts/ajax/editaddress.php

apps/contacts/ajax/editaddressbook.php

apps/contacts/ajax/editname.php

apps/contacts/ajax/importaddressbook.php

apps/contacts/ajax/importdialog.php