wrap nav menu in block for easier customization
Merge branch 'menu_block' into c_prod

Conflicts:
	Resources/views/standard_layout.html.twig