Merge branch '2014.11-develop' into 2015.11

Conflicts:
	tests/tine20/Tinebase/ControllerTest.php

Change-Id: Ia366fe87ea514e6f879c6b654432da04c1f6ae0e

diff --cc tests/tine20/Tinebase/ControllerTest.php
index 3eee2ad,5cc7a20..c011c4d
--- 1/tests/tine20/Tinebase/ControllerTest.php
--- 2/tests/tine20/Tinebase/ControllerTest.php
+++ b/tests/tine20/Tinebase/ControllerTest.php
@@@ -68,9 -75,9 +68,9 @@@ class Tinebase_ControllerTest extends P
                  Tinebase_Helper::array_value('password', TestServer::getInstance()->getTestCredentials()),
                  new \Zend\Http\PhpEnvironment\Request()
              );
-             $this->fail('expected maintenance mode exception');
+             $this->fail('expecting exception: Tinebase_Exception_MaintenanceMode');
 -        } catch (Tinebase_Exception $te) {
 -            $this->assertTrue($te instanceof Tinebase_Exception_MaintenanceMode);
 +        } catch (Tinebase_Exception_MaintenanceMode $temm) {
 +            $this->assertEquals('Installation is in maintenance mode. Please try again later', $temm->getMessage());
          }
      }