Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-828-imap-contributions

Conflicts:
	src/backend/imap/imap.php
	src/vendor/composer/autoload_classmap.php