use ocdialog instead of bottom-left controls
remove buildImportSelect2()
reimplemented import ui in a ocdialog
adapted import ui to fit in the ocdialog
might be some bugs left though
removed unnecessary debugging functions
Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui

Conflicts:
	js/addressbooks.js
	templates/contacts.php
Merge remote-tracking branch 'origin/import-new-ui' into import-new-ui
workaround for the AddressbookList which is empty when the import dialog is opened
[to be removed when the parent bug will be solved]
Change "vcardcountry" to "c" for HOME ADR

Instead of "vcardcountry", "c" is used for "RFC2256: ISO-3166 country 2-letter code" in objectClass "inetOrgPerson".
return 'PHOTO' attribute on AddressbookProvider::search
Use OCP\ITags in lib/controller/importcontroller.php.
fix excessive overwrite of mobile sizes defined in core, fix #555
correct selection of current type for multi-type parameters: #536

This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
[tx-robot] updated from transifex
Change label when there is no contact
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
adding php-lint
fix php 4.3