replaced deleteList by markings
replaced writeList by marked contacts
altered contact removal strategy
moved some code to new method readContacts
moved some code to new writeContacts method
renamed scanContacts to cleanContacts
restructured merging by messengers
corrected cleanByMessenger
fixed bugs, completed cleanByPhone
added cleanByName method and moved Code to it
name comparison now also includes nicknames
fixed syntac error (wrong return type of name.nicknames() )
implemented recursive usage of comparison loops
implemented warning for mismatching birthdays
implemented invalid filter for messenger ids without type specification
bugFix in cleanByMessengers: now using nicks instead of ids
re-added name field, which was missing since an unknown amount of time
fixed bug introduced with release 1.1: name field hidden when name not
null
Merge branch 'devel' into rearrange
removed limitation on number of contacts introduced to speed up tests
Merge branch 'master' into german

Conflicts:
	src/CardDavCleaner.java