Fix
Merge branch 'master' of https://github.com/MINISTRYGmbH/morrow-docs

Conflicts:
	composer.json
	composer.lock