Merge branch 'master' of gitorious.org:owncloud/owncloud

apps/contacts/ajax/importaddressbook.php

apps/contacts/ajax/uploadimport.php

apps/contacts/css/contacts.css

apps/contacts/import.php

apps/contacts/js/contacts.js

apps/contacts/lib/app.php

apps/contacts/lib/vcard.php

apps/contacts/templates/part.chooseaddressbook.php

apps/contacts/templates/part.chooseaddressbook.rowfields.php

apps/contacts/templates/part.contact.php

lib/app.php