Merge branch '2015.11-develop' into 2016.11

Change-Id: Id27d5c3005ff9125f552548553d56b0328a44fe2

diff --cc tine20/Calendar/Export/Ical.php
Simple merge

diff --cc tine20/Expressomail/js/AddressbookGridPanelHook.js
Simple merge

diff --cc tine20/Expressomail/js/Expressomail.js
Simple merge

diff --cc tine20/composer.json
index d64762a,4614f56..028b7a5
--- 1/tine20/composer.json
--- 2/tine20/composer.json
+++ b/tine20/composer.json
@@@ -32,8 -34,9 +32,9 @@@
          "sabre/vobject": "3.1.3 as 2.1.313",
          "metaways/opendocument": "1.1",
          "metaways/timezoneconvert": "0.2",
 -        "zendframework/zend-http": "2.2.8-p3 as 2.2.8",
 -        "doctrine/orm": "2.5.*",
 +        "zendframework/zend-http": "2.4.*",
 +        "doctrine/orm": "2.5.*"
+         "twig/twig": "~1.0"
      },
      "require-dev": {
          "phpunit/phpunit": "3.7.*",

diff --cc tine20/composer.lock
index 7f15240,89c38b0..4fe17f8
--- 1/tine20/composer.lock
--- 2/tine20/composer.lock
+++ b/tine20/composer.lock
@@@ -1269,11 -1167,72 +1269,72 @@@
                      "Tine20\\ComposerAppLoader\\": "src/"
                  }
              },
 -            "time": "2016-07-14 11:55:28"
 +            "time": "2016-09-02 09:26:20"
          },
          {
+             "name": "twig/twig",
+             "version": "v1.27.0",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/twigphp/Twig.git",
+                 "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
+                 "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
+                 "shasum": ""
+             },
+             "require": {
+                 "php": ">=5.2.7"
+             },
+             "require-dev": {
+                 "symfony/debug": "~2.7",
+                 "symfony/phpunit-bridge": "~2.7"
+             },
+             "type": "library",
+             "extra": {
+                 "branch-alias": {
+                     "dev-master": "1.27-dev"
+                 }
+             },
+             "autoload": {
+                 "psr-0": {
+                     "Twig_": "lib/"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "BSD-3-Clause"
+             ],
+             "authors": [
+                 {
+                     "name": "Fabien Potencier",
+                     "email": "fabien@symfony.com",
+                     "homepage": "http://fabien.potencier.org",
+                     "role": "Lead Developer"
+                 },
+                 {
+                     "name": "Armin Ronacher",
+                     "email": "armin.ronacher@active-4.com",
+                     "role": "Project Founder"
+                 },
+                 {
+                     "name": "Twig Team",
+                     "homepage": "http://twig.sensiolabs.org/contributors",
+                     "role": "Contributors"
+                 }
+             ],
+             "description": "Twig, the flexible, fast, and secure template language for PHP",
+             "homepage": "http://twig.sensiolabs.org",
+             "keywords": [
+                 "templating"
+             ],
+             "time": "2016-10-25 19:17:17"
+         },
+         {
              "name": "zendframework/zend-escaper",
 -            "version": "2.2.10",
 +            "version": "2.4.10",
              "source": {
                  "type": "git",
                  "url": "https://github.com/zendframework/zend-escaper.git",