Javadoc - build.xml + doc

-javadoc suport in build XML
-documentation of AggregatedContact
Merge branch 'master' of https://github.com/F-I-D-O/Merge

Conflicts:
	src/fido/contacts/merge/data/AggregatedContact.java