Fixes NullPointerException when merging contacts.
Adds option to embed jre into dmg and enables it.
Fixes some wrong matching when searching in history, a keyword matching needed but field to search for keywords is not present in the history record node.