[BackendBundle] MAJ sur la vue d'administration
[BackendBundle] merge commit
Merge branches 'master' and 'master' of https://github.com/jmabilais/eni-qcm

Conflicts:
	src/Eni/BackendBundle/Resources/views/Default/index.html.twig
	src/Eni/BackendBundle/Resources/views/Theme/index.html.twig