Fix bug with password storage, where some characters would lead to
passwords not being remembered correctly.  This was because the UTF-8
character map is used for encryption, but the platform default is used for
decryption (which is ANSI for Windows 7).  UTF-8 is now used both ways.
Use config to control whether user can change presence state from the systray.
No change to default behaviour (i.e. user can change presence state).
Update JVM crash file location for OSX 10.6-10.8
and
Fix error with log collector filename filter
Say that contact details match if one is null and the other is empty,
rather than only if both null or both empty.
Add new config option to disable merging contacts, which removse 'Add
contact' from the contact right button menu.

Existing config options for 'move contact' and drag-and-drop of contacts
must also be used to completely prevent merging.
Merge branch 'password' of \\\PC4315\work\github_jitsi\
Merge branch 'systray_presence_config' of \\\PC4315\work\github_jitsi\
Merge branch 'jvm_diags' of \\\PC4315\work\github_jitsi\
Merge branch 'contact_matching' of \\\PC4315\work\github_jitsi\
Merge branch 'merge_config' of \\\PC4315\work\github_jitsi\