Merge remote-tracking branch 'origin/contao3'

Conflicts:
	README.md