Merge branch '2015.11' into 2015.11-develop

Change-Id: I4f84471511ea4b874dbd3f6db58c73b3bba43260

diff --cc tine20/Addressbook/Config.php
index 036e362,4d9a990..dc24ad4
--- 1/tine20/Addressbook/Config.php
--- 2/tine20/Addressbook/Config.php
+++ b/tine20/Addressbook/Config.php
@@@ -114,21 -115,16 +122,31 @@@ class Addressbook_Config extends Tineba
              'setByAdminModule'      => FALSE,
              'setBySetupModule'      => FALSE,
          ),
 +        self::LIST_TYPE => array(
 +                //_('List types available')
 +                'label'                 => 'List types available',
 +                //_('List types available.')
 +                'description'           => 'List types available.',
 +                'type'                  => 'keyFieldConfig',
 +                'clientRegistryInclude' => TRUE,
 +                'setByAdminModule'      => true,
 +                'default'               => array(
 +                    'records' => array(
 +                        array('id' => 'DEPARTMENT',    'value' => 'Department'), //_('Department')
 +                        array('id' => 'MAILINGLIST',    'value' => 'Mailing list'), //_('Mailing list')
 +                    ),
 +            )
 +        ),
+         self::CONTACT_IMPORT_NOMINATIM => array(
+             //_('Use Nominatim during contact import')
+             'label'                 => 'Use Nominatim during contact import',
+             'description'           => 'Use Nominatim during contact import',
+             'type'                  => 'bool',
+             'default'               => false,
+             'clientRegistryInclude' => false,
+             'setByAdminModule'      => true,
+             'setBySetupModule'      => true,
+         ),
      );
      
      /**