Zentyal Openchange handles z-push config files
Merge branch 'master' into mjulian/z-push-templates

Conflicts:
	main/openchange/ChangeLog
Merge branch 'mjulian/z-push-templates'

Conflicts:
	main/openchange/ChangeLog