Menu access restricted to admin
Merge remote-tracking branch 'origin/master' into content

Conflicts:
	Resources/config/services.yml