Merge pull request #147 in ZP/z-push from...

Merge pull request #147 in ZP/z-push from bugfix/ZP-833-change-zcp-default-server-location to develop

* commit '7d7ebda7':
  ZP-833 Use http socket as default MAPI_SERVER.

(cherry picked from commit 1bd7cd25)

Conflicts:
	src/backend/zarafa/config.php

src/backend/zarafa/config.php

@@ -2,11 +2,11 @@
 /***********************************************
 * File      :   config.php
 * Project   :   Z-Push
-* Descr     :   VCardDir backend configuration file
+* Descr     :   Zarafa backend configuration file
 *
 * Created   :   27.11.2012
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2016 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -46,6 +46,4 @@
 // ************************
 
 // Defines the server to which we want to connect
-define('MAPI_SERVER', 'file:///var/run/zarafa');
-
-?>
\ No newline at end of file
+define('MAPI_SERVER', 'http://127.0.0.1:236/zarafa');