Merge branch '2015.11' into 2015.11-develop

Change-Id: I5f657461875e964df047f7e5cd25e9dffe283db5

diff --cc tine20/Addressbook/Model/ContactFilter.php
Simple merge

diff --cc tine20/Addressbook/js/Model.js
index f59f82b,ad89ea0..48e8d6f
--- 1/tine20/Addressbook/js/Model.js
--- 2/tine20/Addressbook/js/Model.js
+++ b/tine20/Addressbook/js/Model.js
@@@ -182,13 -179,21 +182,21 @@@ Tine.Addressbook.Model.Contact.getFilte
          {label: app.i18n._('City') + ' (' + app.i18n._('Private Address') + ')',        field: 'adr_two_locality'},
          {label: app.i18n._('Country') + '  (' + app.i18n._('Private Address') + ')',    field: 'adr_two_countryname', valueType: 'country'},
          {label: app.i18n._('Type'), defaultValue: 'contact', valueType: 'combo',        field: 'type',               store: typeStore},
 -        {label: _('Last Modified Time'),                                                field: 'last_modified_time', valueType: 'date'},
 -        {label: _('Last Modified By'),                                                  field: 'last_modified_by',   valueType: 'user'},
 -        {label: _('Creation Time'),                                                     field: 'creation_time',      valueType: 'date'},
 -        {label: _('Created By'),                                                        field: 'created_by',         valueType: 'user'},
 +        {label: i18n._('Last Modified Time'),                                                field: 'last_modified_time', valueType: 'date'},
 +        {label: i18n._('Last Modified By'),                                                  field: 'last_modified_by',   valueType: 'user'},
 +        {label: i18n._('Creation Time'),                                                     field: 'creation_time',      valueType: 'date'},
-         {label: i18n._('Created By'),                                                        field: 'created_by',         valueType: 'user'}
++        {label: i18n._('Created By'),                                                        field: 'created_by',         valueType: 'user'},
+         {
+             label: app.i18n._('Salutation'),
+             field: 'salutation',
+             filtertype: 'tine.widget.keyfield.filter',
+             app: app,
+             keyfieldName: 'contactSalutation',
+             defaultOperator: 'in'
+         }
      ];
  };
--    
++
  /**
   * default timesheets backend
   */

diff --cc tine20/Setup/Frontend/Cli.php
Simple merge