* commit 'e05963aa': (22 commits)
  ZP-731 Tagged 2.2.6 final.
  ZP-731 Updated version, merged latest change.
  Merge pull request #86 in ZP/z-push from feature/ZP-757-add-getmapping-function-to-streamer to develop
  ZP-731 Merged and bumped to 2.2.6beta2+ZP-756.
  Merge pull request #85 in ZP/z-push from bugfix/ZP-756-memory_get_peak_usage-is-not-available to develop
  ZP-731 Bumped version to beta2, fixed whitespace.
  Merge pull request #78 in ZP/z-push from bugfix/ZP-740-ping-is-not-able-to-wait to develop
  ZP-731 Bumped version to 2.2.6 beta1. Removed newline.
  Merge pull request #74 in ZP/z-push from bugfix/ZP-732-nexus-5-android-6-sends-empty-data to develop
  ZP-731 Bumped version to 2.2.6beta. Removed newlines.
  Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop
  Merge pull request #72 in ZP/z-push from bugfix/ZP-730-check-internal-notifications-if-states to develop
  Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop
  Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop
  Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop
  Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop
  Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop
  Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop
  Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop
  Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop
  ...

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 #86 in ZP/z-push from feature/ZP-757-add-getmapping-function-to-streamer to develop

* commit '49536031':
  ZP-757 Add GetMapping function to Streamer. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit e3ac9b1d)

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

Merge pull request #85 in ZP/z-push from bugfix/ZP-756-memory_get_peak_usage-is-not-available to develop

* commit '99ddef76':
  ZP-756 add compat function for memory_get_peak_usage.
  ZP-756 add compat function for memory_get_peak_usage.

(cherry picked from commit 7b3448b1)

Conflicts:
	src/lib/utils/compat.php

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

* commit '01f2c4a9':
  ZP-740 Set UUID, count & queued when loop data is created by SetSyncStateUsage(), log if IsSyncStateObsolete() does not find any data, log Loopdetection->Detect(), reset loopcount in case of 1.2.1, set type in Detect() if data is created by SetSyncStateUsage().

(cherry picked from commit d5d96750)

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

Merge pull request #74 in ZP/z-push from bugfix/ZP-732-nexus-5-android-6-sends-empty-data to develop

* commit '55a359c1':
  ZP-732 Accept empty <Data/> Tag.

(cherry picked from commit 87e0633d)

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

Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop

* commit 'bb60677f':
  ZP-702 Implement seeking capability to MAPIStreamWrapper. Add stream size to log output.
  ZP-702 Attachments are 1 or 2 bytes short. Released under the Affero GNU General Public License (AGPL) version 3. Fixed empty attachment data written, because stream was not at the beginning eg. by a previous call to fstat. Also logging now number of bytes written and not length of stream, to be able to detect similar problems.
  ZP-702 Implement plain and base64 encoded stream support into the wbxml encoder and streamer. Removed padding filter and added a null-char-replace filter used when streaming plain streams (tested but not part of this ticket).
  ZP-702 Attachments are 1 or 2 bytes short if size is not 3 byte aligned. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 64f7bbb2)

Conflicts:
	src/lib/wbxml/replacenullcharfilter.php

Merge pull request #72 in ZP/z-push from bugfix/ZP-730-check-internal-notifications-if-states to develop

* commit '0d4b2873':
  ZP-730 Undo change of ZP-631 (enabling notification check again). Check the states integrity before validating the notification. If state has been use, force a sync of the folder.

(cherry picked from commit aeab7567)

* commit 'bb60cb47':
  ZP-728 Use constant WINDOW_SIZE_MAX for the max window size.
  ZP-728 Use 512 as default WindowSize for a single folder, but limit the GlobalWindowSize to the SYNC_MAX_ITEMS configured.

(cherry picked from commit f262bf07)

Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop

* commit '8139b02b':
  ZP-656 Only prepend transport headers if they are available. Do not include the newlines to separate the headers from the body, as the data already contains headers and the separating lines. If no transport headers are available in the case of a signed message do not use the signed attachment but let imtoinet() generate the email as it generates the headers by default. See ZP-725 for more information.

(cherry picked from commit 81ad5685)

Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop

* commit 'ce1fe248':
  ZP-726 Infinit loop if non-stream is given for an attachment. Released under the Affero GNU General Public License (AGPL) version 3. need to check for a resource, as eg. feof("Error") === false and causing infinit loop in while!

(cherry picked from commit aafbbdfa)

Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop

* commit '4c91e8b0':
  ZP-720 Write memory information and END tag also to the user log file.

(cherry picked from commit d8979595)

* commit 'c782d49a':
  ZP-724 Add CalendarType also to SyncTaskRecurrence and SyncMeetingRequestRecurrence objects.
  ZP-724 Add instance variable for calendar type.
  ZP-724 ADD CalendarType to SyncRecurrence object.

(cherry picked from commit a8b25c37)

Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop

* commit 'd72a5be9':
  ZP-677 Expose ResyncFolder to webservice. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 63f86fdc)

Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop

* commit '1bf55951':
  ZP-721 Added option to tail the error log file, "wide view" can now also be disabled.

(cherry picked from commit 9dced9e2)

Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop

* commit '92031424':
  ZP-717 Don't use $props as it is used before.
  ZP-717 Set PR_LAST_VERB_EXECUTED and PR_LAST_VERB_EXECUTION_TIME correctly when replying/forwarding an email.

(cherry picked from commit 657e2548)

Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop

* commit '27454aad':
  ZP-704 Fixed white space.
  ZP-704 z-push-top screen-size calculation fails under OS X. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit ba460f57)

Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop

* commit 'e6b04fab':
  ZP-676 Removed trailing space. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-676 Fix to handle incoming STREAMER_TYPE_SEND_EMPTY property type. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 113e7645)

* commit '71e0f49f': (27 commits)
  ZP-727 Bump to 2.2.5 final, Fix newline.
  Revert "Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop"
  Revert "Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop"
  Revert "Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop"
  Revert "Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop"
  Revert "Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop"
  Revert "Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop"
  Revert "Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop"
  Revert "Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop"
  Revert "Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop"
  Revert "Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop"
  Revert "Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop"
  ZP-727 Bumped version to 2.2.5alpha1 and removed newlines at end of files.
  Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop
  ZP-727 Bump version to 2.2.5 alpha. Removed newlines at end of files for modified files.
  Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop
  Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop
  Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop
  Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop
  Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop
  ...

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

Revert "Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop"

This reverts commit 725bec89.

Revert "Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop"

This reverts commit 792ce30e.

Revert "Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop"

This reverts commit 28a8e536.

Revert "Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop"

This reverts commit 16800140.

Revert "Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop"

This reverts commit 8e916a4e.

Revert "Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop"

This reverts commit db7d11d4.

Revert "Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop"

This reverts commit 139d7186.

Revert "Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop"

This reverts commit fa8f2b14.

Revert "Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop"

This reverts commit fae25884.

Revert "Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop"

This reverts commit 307dc5e1.

Revert "Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop"

This reverts commit 4ececf06.

files.

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

* commit 'bb60cb47':
  ZP-728 Use constant WINDOW_SIZE_MAX for the max window size.
  ZP-728 Use 512 as default WindowSize for a single folder, but limit the GlobalWindowSize to the SYNC_MAX_ITEMS configured.

(cherry picked from commit f262bf07)

modified files.

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

Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop

* commit 'bb60677f':
  ZP-702 Implement seeking capability to MAPIStreamWrapper. Add stream
size to log output.
  ZP-702 Attachments are 1 or 2 bytes short. Released under the Affero
GNU General Public License (AGPL) version 3. Fixed empty attachment data
written, because stream was not at the beginning eg. by a previous call
to fstat. Also logging now number of bytes written and not length of
stream, to be able to detect similar problems.
  ZP-702 Implement plain and base64 encoded stream support into the
wbxml encoder and streamer. Removed padding filter and added a
null-char-replace filter used when streaming plain streams (tested but
not part of this ticket).
  ZP-702 Attachments are 1 or 2 bytes short if size is not 3 byte
aligned. Released under the Affero GNU General Public License (AGPL)
version 3.

(cherry picked from commit 64f7bbb2)

Conflicts:
	src/lib/wbxml/replacenullcharfilter.php