Tags allow spaces
Merge branch '3.0'

Conflicts:
	app/config/Routes.yml