Conflicts:
	build/version.php.in
	composer.json
	src/autodiscover/autodiscover.php
	src/backend/imap/imap.php
	src/backend/kopano/importer.php
	src/backend/kopano/kopano.php
	src/backend/kopano/listfolders.php
	src/backend/kopano/mapiprovider.php
	src/backend/kopano/mapiutils.php
	src/index.php
	src/lib/core/changesmemorywrapper.php
	src/lib/core/devicemanager.php
	src/lib/core/loopdetection.php
	src/lib/core/streamer.php
	src/lib/core/synccollections.php
	src/lib/core/zlog.php
	src/lib/core/zpush.php
	src/lib/default/diffbackend/diffstate.php
	src/lib/default/filestatemachine.php
	src/lib/request/folderchange.php
	src/lib/request/foldersync.php
	src/lib/request/ping.php
	src/lib/request/provisioning.php
	src/lib/request/sync.php
	src/lib/syncobjects/syncrecurrence.php
	src/lib/syncobjects/synctaskrecurrence.php
	src/lib/utils/compat.php
	src/lib/utils/timezoneutil.php
	src/lib/utils/utils.php
	src/lib/utils/zpushadmin.php
	src/lib/wbxml/replacenullcharfilter.php
	src/lib/wbxml/wbxmlencoder.php
	src/lib/webservice/webservice.php
	src/lib/webservice/webservicedevice.php
	src/version.php
	src/z-push-admin.php
	src/z-push-top.php

* commit '257a2a78':
  ZP-999 Fixed example configuration.
  ZP-1003 Protected methods should start with a lowercase letter. Fixed names plural.
  ZP-1003 Always open store of the login user so we have a defaultstore available. Don't log when opening the store. Added missing property PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE to be fetched from the GAB.
  ZP-1001 Requestid in MeetingResponse is not split.
  ZP-1000 Not possible to accept meeting request on iPhone.

Merge pull request #317 in ZP/z-push from bugfix/ZP-1003-koe-sync-gab-is-not-always-able-to to develop

* commit 'ae0263bb':
  ZP-1003 Protected methods should start with a lowercase letter. Fixed names plural.
  ZP-1003 Always open store of the login user so we have a defaultstore available. Don't log when opening the store. Added missing property PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE to be fetched from the GAB.

Merge pull request #314 in ZP/z-push from bugfix/ZP-1001-requestid-in-meetingresponse-is-not to develop

* commit '85549f36':
  ZP-1001 Requestid in MeetingResponse is not split.

Merge pull request #313 in ZP/z-push from bugfix/ZP-1000-not-possible-to-accept-meeting-request to develop

* commit '5093d44d':
  ZP-1000 Not possible to accept meeting request on iPhone.

Merge pull request #318 in ZP/z-push from bugfix/ZP-999-change-define-imap_folder_drafts-gmail-drafts to develop

* commit '288c4241':
  ZP-999 Fixed example configuration.

Released under the Affero GNU General Public License (AGPL) version 3.

names plural.

Released under the Affero GNU General Public License (AGPL) version 3.

available. Don't log when opening the store.
Added missing property PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE to be
fetched from the GAB. 

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'a93e5be5': (23 commits)
  ZP-995 Warnings in WebserviceInfo->ListUserFolders().
  ZP-994 On missing permissions WebserviceInfo->ListUserFolders() returns own folders.
  ZP-989 remove obsolete comments.
  ZP-990 Detect case that KOE is sending changed categories back and ignore it if categories are the same on the server and in outlook.
  ZP-989 Output current permission flags on all additional folders in AdditionalFolderList(), criteria to add a shared folder in the ChangesMemoryWrapper should always be on the read only flag, refixed typo in Kopano backend.
  ZP-989 Reverted: "Remove readonly parameter from backends' Setup() function. Check"
  ZP-984 Check permissions to access the getUsers store only in in the WebserviceDevice webservice and not generally.
  ZP-990 Detect case that KOE is sending changed categories back.
  ZP-982 Fixed typo.
  ZP-993 Allow to disable outlook and mobile devices' access separately.
  ZP-989 Backward compatibility fixes for old style folder ids.
  ZP-989 Remove readonly parameter from $additionalFolders in config.php and where it was used in the code.
  ZP-987 Allow text keys when using memcache IPC, have a defined mutex name in memcache, suppress errors on unlinking memcache-down file, use device id for IPC type (key) in PingTracking and LoopDetection (one datakey + mutex per device!), check if TopCollector is enabled without blocking the mutex.
  ZP-989 Remove readonly parameter when adding an additional folder via webservice.
  ZP-989 Remove readonly parameter from backends' Setup() function. Check for only read permission in Kopano backend Setup().
  ZP-986 Added option to completely disable the TopCollector.
  ZP-991 Fix evaluation order for PHP 7.
  ZP-978 Load policies from default section policy file.
  ZP-980 Exception of an all day recurrence is not all day.
  ZP-981 Error deleting an all-day occurrence on a mobile device. Some code style fixes.
  ...

Merge pull request #311 in ZP/z-push from bugfix/ZP-995-warnings-in-webserviceinfo--listuserfolders to develop

* commit '802f46eb':
  ZP-995 Warnings in WebserviceInfo->ListUserFolders().

Merge pull request #310 in ZP/z-push from bugfix/ZP-994-on-missing-permissions-webserviceinfo--listuserfolders to develop

* commit '56f45944':
  ZP-994 On missing permissions WebserviceInfo->ListUserFolders() returns own folders.

Released under the Affero GNU General Public License (AGPL) version 3.

own folders.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #309 in ZP/z-push from bugfix/ZP-989-remove-readonly-flag-from-configuration to develop

* commit '5fbc857e':
  ZP-989 remove obsolete comments.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #305 in ZP/z-push from feature/ZP-993-allow-to-disable-outlook-access-from to develop

* commit 'a876083b':
  ZP-993 Allow to disable outlook and mobile devices' access separately.

Merge pull request #308 in ZP/z-push from bugfix/ZP-990-koe-race-condition-when-connecting to develop

* commit '13dba524':
  ZP-990 Detect case that KOE is sending changed categories back and ignore it if categories are the same on the server and in outlook.
  ZP-990 Detect case that KOE is sending changed categories back.

Merge pull request #304 in ZP/z-push from bugfix/ZP-989-warning-that-readonly-flag-is-undefined to develop

* commit '881fc1f3':
  ZP-989 Output current permission flags on all additional folders in AdditionalFolderList(), criteria to add a shared folder in the ChangesMemoryWrapper should always be on the read only flag, refixed typo in Kopano backend.
  ZP-989 Reverted: "Remove readonly parameter from backends' Setup() function. Check"
  ZP-989 Backward compatibility fixes for old style folder ids.
  ZP-989 Remove readonly parameter from $additionalFolders in config.php and where it was used in the code.
  ZP-989 Remove readonly parameter when adding an additional folder via webservice.
  ZP-989 Remove readonly parameter from backends' Setup() function. Check for only read permission in Kopano backend Setup().

Merge pull request #307 in ZP/z-push from bugfix/ZP-984-unable-to-list-folders-of-a-another to develop

* commit '9c15015d':
  ZP-984 Check permissions to access the getUsers store only in in the WebserviceDevice webservice and not generally.

ignore it if categories are the same on the server and in outlook.

Released under the Affero GNU General Public License (AGPL) version 3.

AdditionalFolderList(), criteria to add a shared folder in the
ChangesMemoryWrapper should always be on the read only flag, refixed
typo in Kopano backend.

Released under the Affero GNU General Public License (AGPL) version 3.

This reverts commit e632b0e4.

Released under the Affero GNU General Public License (AGPL) version 3.

WebserviceDevice webservice and not generally.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #306 in ZP/z-push from bugfix/ZP-982-include-buildfiles-in-git-repository to develop

* commit '4d6d029c':
  ZP-982 Fixed typo.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #296 in ZP/z-push from ~FBARTELS/z-push:bugfix/ZP-982-include-buildfiles-in-git-repository to develop

* commit 'fe1d67ff':
  delete old debian.readme which had been carid on from the original d-push package. move lighttpd and nginx example config to config folder
  ZP-982 include-buildfiles-in-git-repository Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

* commit '3e1dc635':
  ZP-991 Fix evaluation order for PHP 7.

* commit 'ef2eacb3':
  ZP-987 Allow text keys when using memcache IPC, have a defined mutex name in memcache, suppress errors on unlinking memcache-down file, use device id for IPC type (key) in PingTracking and LoopDetection (one datakey + mutex per device!), check if TopCollector is enabled without blocking the mutex.

Merge pull request #302 in ZP/z-push from feature/ZP-986-possibility-to-disable-topcollector to develop

* commit 'dc0490a7':
  ZP-986 Added option to completely disable the TopCollector.

Merge pull request #297 in ZP/z-push from bugfix/ZP-981-error-deleting-an-all-day-occurrence to develop

* commit 'e1c51ed4':
  ZP-981 Error deleting an all-day occurrence on a mobile device. Some code style fixes.

Merge pull request #298 in ZP/z-push from bugfix/ZP-980-exception-of-an-all-day-recurrence to develop

* commit '86e2694f':
  ZP-980 Exception of an all day recurrence is not all day.

Merge pull request #299 in ZP/z-push from bugfix/ZP-978-load-policies-from-default-section to develop

* commit '94aac647':
  ZP-978 Load policies from default section policy file.

and where it was used in the code.

Released under the Affero GNU General Public License (AGPL) version 3.

* commit '5459f0e5':
  ZP-977 Closing streams after exporting.