whitespace - tabkill
Axe handling of sogo 0.9 gnustep domain migration
Fix order of precedence for options

Fixes #2066 and #2166
Enforce the following order of precedence for options, first match wins:
  1. Command line arguments
  2. .GNUstepDefaults
  3. /etc/sogo/{debconf,sogo}.conf
  4. SOGoDefaults.plist
Remove control characters before returning JSON
Fix "Send Anyway" string wrt localizable strings
Fix tooltips in contacts list
Fixup handling NSArgumentDomain arguments

would fix #2216
Read credential files using dataWithContentsOfFile

Again, to cope with older gnusteps which don't have
stringWithContentsOfFile:encoding:error:
Merge pull request #9 from inverse-inc/fix/2066_options-precedence

Fix/2066 options precedence
news file update for 2.0.4b
Fix link to ACL editor for any authenticated user
Fix classification menu in component editor
Revisit option handling

Really fix #2166
The previous fix (46b53b3) was wrong since SOPE was able to override
the 'final' config with its defaults.

This now uses a new approach using a volatile domain and a reordering
of the search list :
  *   NSArgumentDomain (command line arguments)
  *   sogodRuntimeDomain (config from all config files)
  *   GSPrimaryDomain
  *   NSGlobalDomain
  *   GSConfigDomain
  *   (languages)
  *   NSRegistrationDomain (SOPE loads its defaults in this one)
Merge branch 'test/userdefaults'
Fix saving prefs with disabled mail module
Update NEWS file
Add missing strings to mail module

The two columns names of the contacts pane were missing. They have
been copied from the contact module.
Bump userkey length from 64 to 160 bytes

Allows for much longer username@domain:password strings.
Fixes #2212

To bump it further, the database schema will have to be updated
to allow a longer c_value (currently 255 chars)
Updated NEWS
Bump version to 2.0.4b