fix
minor improvements
increased version number to 2.6
Merge branch 'v2.6' into beta

Conflicts:
	app/Resources/views/base.html.twig