added commentation to the main code
united createInputField and createPasswordField
Merge branch 'master' into dev

Conflicts:
	src/CardDavCleaner.java
added thunderbirdMerge for phone numbers
added thunderbird merge actions for phones and contacts, added message
dialog
changed error messages
for thunderbird useage the number and email categories are now
restricted to one per entry.
changed abort message