global settings
Merge remote-tracking branch 'origin/settings'

Conflicts:
	Resources/views/RoleMenu/index.html.twig