Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-849-implement-integer-folder-ids

Conflicts:
	src/lib/core/asdevice.php
	src/lib/core/synccollections.php
	src/lib/request/sync.php