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.
Renames and moves the cusax account property from cusax.xmppAccountID to
cusax.XMPP_ACCOUNT_ID.
Increments version minor to 3 (i.e. nightly version prefix is not 2.3)
Fixes recent breakage of FEC decoding in the Opus codec.
Make sure accounts have at least one attempt to login AFTER the reconnect
plugin has started listening for RegistrationEvents (so it can be notified
of failures)
Don't fail loading of services on empty config values
Completely remove config section
Bind phone prefix change events
Cache parsed database
Add resource string for no conferencing account available message
Commit from translate.jitsi.org by user emcho.: 1458 of 1458 strings translated (0 fuzzy).
Merge branch 'master' of github.com:jitsi/jitsi
Update jmork to rev a18997b (accept newlines in values)
Merge branch 'master' of github.com:jitsi/jitsi
Adds logs.
Fix comment