updated Jar-files and pad file
moved misplaced jars
Merge branch 'master' into devel
splitted mergeWith method into several merge methods for the different
contact parts
sorted methods
phone comparison now by simple number
improved simpleNumber
AdressList newly created
implemented contact merging, needs to be tested
implemented remaining methods of AdressList
implemented merging of adresses, fixed bugs
added interface Mergable,
converted AdressList to MergableList
implementing Merge-methods for name and adress
sorted methods in name
added name criterion to compatibility chack in contact
implemented mergable code in bday
implemented merge methods,
altered conflictsWith function
made label mergable
made phone mergable
reimplemented merging of phone numbers using mergeabeList