Merge branch 'develop' of https://stash.z-hub.io/scm/zp/z-push into feature/ZP-556-having-access-to-the-public-folder

Conflicts:
	src/lib/core/devicemanager.php