fix merge conflicts

diff --cc apps/contacts/css/contacts.css
index 15f98cffbfb8cbf0f3be84d2891d8152251fe040,7338eed4a7fc966c90e90c717c13957fef0cd5e8..2ea99a56a7b09c1f86b54ce4c3bbd17768a31b8e
--- 1/apps/contacts/css/contacts.css
--- 2/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@@ -33,8 -33,10 +33,9 @@@ dl.form { width: 100%; float: left; cle
  .form dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0px; white-space: nowrap; vertical-align: text-bottom; }
  #address.form dt { min-width: 5em; }
  #address.form dl { min-width: 10em; }
- 
 +.loading {/*cursor: progress; */ cursor: wait; }
+ .droptarget { margin: 0.5em; padding: 0.5em; border: thin solid #ccc; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
+ .droppable { margin: 0.5em; padding: 0.5em; border: thin dashed #333; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; }
 -.loading { background: url('../../../core/img/loading.gif') no-repeat center !important; /*cursor: progress; */ cursor: wait; }
 -.ui-autocomplete-loading { background: url('../../../core/img/loading.gif') right center no-repeat; }
  .float { float: left; }
  .listactions { height: 1em; width:60px; float: left; clear: right; }
  .add,.edit,.delete,.mail, .globe, .upload, .cloud { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; opacity: 0.1; }
@@@ -51,7 -60,8 +52,8 @@@
  #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
  /*#contact_photo { max-width: 250px; }*/
  #contact_identity { min-width: 30em; }
 -.contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto: border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
+ #note { min-width: 200px; }
 +.contactsection { position: relative; float: left; /*max-width: 40em;*/ padding: 0.5em; height: auto; border: thin solid lightgray;/* -webkit-border-radius: 0.5em; -moz-border-radius: 0.5em; border-radius: 0.5em; background-color: #f8f8f8;*/ }
  
  .contactpart legend { width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
  #cropbox { margin: auto; }
@@@ -90,5 -100,5 +92,4 @@@ input[type="checkbox"] { width: 20px; h
  .propertylist li > input[type="checkbox"],input[type="radio"] { float: left; clear: left; width: 20px; height: 20px; vertical-align: middle; }
  .propertylist li > select { float: left; max-width: 8em; }
  .typelist { float: left; max-width: 10em; } /* for multiselect */
--.addresslist { clear: both; }
--
++.addresslist { clear: both; }

diff --cc apps/contacts/import.php
Simple merge

diff --cc apps/contacts/js/contacts.js
index f684576b7870b6270c6e883bdb2df251db684878,e00e9257e651c6a7bf21989033ee97536d45c08a..b94bf77c5ecd4186ab76f3ff939cbe569928bd23
--- 1/apps/contacts/js/contacts.js
--- 2/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@@ -1604,18 -1692,3 +1692,18 @@@ $(document).ready(function()
                $('#contacts_propertymenu').hide();
        });
  });
- });
 +$(document).ready(function() {
 +      $('.add').css('background', 'url('+OC.filePath('core', 'img/actions', 'add.svg')+') no-repeat center');
 +      $('.delete').css('background', 'url('+OC.filePath('core', 'img/actions', 'delete.svg')+') no-repeat center');
 +      $('.edit').css('background', 'url('+OC.filePath('core', 'img/actions', 'rename.svg')+') no-repeat center');
 +      $('.mail').css('background', 'url('+OC.filePath('core', 'img/actions', 'mail.svg')+') no-repeat center');
 +      $('.upload').css('background', 'url('+OC.filePath('core', 'img/actions', 'upload.svg')+') no-repeat center');
 +      $('.cloud').css('background', 'url('+OC.filePath('core', 'img/actions', 'picture.svg')+') no-repeat center');
 +      /*$('.globe').css('background', 'url('+OC.filePath('core', 'img/actions', 'globe.svg')+') no-repeat center');*/
 +      $('.globe').css('background', 'url('+OC.filePath('core', 'img/actions', 'public.svg')+') no-repeat center');
 +      $('#contacts_propertymenu_button').css('background', 'url('+OC.filePath('core', 'img/actions', 'add.svg')+' no-repeat center');
 +      $('.loading').css('background', 'url('+OC.filePath('core', 'img', 'loading.gif')+' no-repeat center !important');
 +      $('.ui-autocomplete-loading').css('background', 'url('+OC.filePath('core', 'img', 'loading.gif')+' right center no-repeat');
 +      $('#contacts_details_photo').css('background', 'url('+OC.filePath('core', 'img', 'loading.gif')+' no-repeat center center');
 +      $('#contacts_propertymenu_button').css('background', 'url('+OC.filePath('core', 'img/actions', 'add.svg')+') no-repeat center');
++});