[tx-robot] updated from transifex
Merge branch 'master' of https://github.com/owncloud/contacts
import in progress
imoprt in progress
2013/11/24
adding csvconnector (not working yet !)
WTF ?
add csv import (prototype)
alpha import, for tests only
add vcard import
ugly hack to make import work in the UI, but it brokes some other things
add csv_gmail and csv_outlook and modify a little bit the import engine to implement the new formats
added importFormat to routes.php, using the Cargo cult technique
still have importcontroller.php to clean up
[tx-robot] updated from transifex
Only search in active address books. Fix #424
Quiet down address book provider
Improve search. Fix #385 and #421
Remove stray App instantiation. Thx @ednt :)
Merge branch 'import' of https://github.com/owncloud/contacts into import

Conflicts:
	formats/import_csv_gmail_connector.xml
	formats/import_csv_outlook_connector.xml
	formats/import_csv_thunderbird_connector.xml
	formats/import_csv_yahoo_connector.xml
	formats/import_ldif_phpldapadmin_connector.xml
	formats/import_vcard_gmail_connector.xml
	formats/import_vcard_yahoo_connector.xml
	lib/connector/importconnector.php
	lib/connector/importcsvconnector.php
	lib/connector/importldifconnector.php
	lib/connector/importvcardconnector.php
	lib/importmanager.php