it's been a long time
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
apparently it works -ish
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
tmp
tmp
Merge branch 'master' of https://github.com/owncloud/contacts into ldap

Conflicts:
	lib/backend/abstractbackend.php
	lib/backend/ldap.php
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
fix bug in ldap->vcard translation that caused the remote update not to work (was hard to find this one !)
apparently it works -ish
Merge branch 'master' of https://github.com/owncloud/contacts into ldap

Conflicts:
	formats/backend_ldap_connector.xml
	lib/backend/abstractbackend.php
	lib/backend/database.php
	lib/backend/ldap.php
	lib/controller/addressbookcontroller.php
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
change new addressbook ui for a dialog
implemented delete ldap addressbook
implementing ldap addressbook modification (draft)
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
first batch of a working of add/update addressbook dialog window

several bugs remaining and code cleaning is necessary