* commit 'df6fc45e':
  ZP-891 Show folderstats log in LOGLEVEL_DEBUG.
  ZP-939 Now with file.
  ZP-939 ZPushAdmin::GetDeviceDetails() should load all states (also the hierarchy cache), mark the KOE GAB folder as gab in the overview of folders of z-push-admin, show folder name of currently synchronizing folders.
  ZP-937 Warn on mutex block only if it takes longer than 50ms.
  ZP-936 Only read 4 additional bytes when we need to truncate and are at end of stream.
  ZP-933 Now with file.
  ZP-933 Fixed wording in ZPushAdmin::ResyncFolder() if no folderid has been submitted for resynching, removed always false check, always strtolower() the searchFor as well.
  ZP-934 Use is_resource() to check the stream, check if categories are set before intersecting.
  ZP-935 Check if ASDevice changed before saving it.
  ZP-933 Added "gab" option for resync type, lookup gab folderid in configuration or device data, fixed resynching long and short folderids, to lookup folderids from backendIds stripdata should not unset backend2folderidCache.
  ZP-250 Fixed typo in Terminate output message.