Corrections _panel_suppressionCentre (test push/pull)
Corrections dans la config Spring
test conflict
Transfert stylesheets manuellement pour corriger les conflits git
Merge branch 'master' of https://github.com/EsupPortail/esup-pstage.git

Conflicts:
	esup-pstage-domain-services/src/main/resources/META-INF/i18n/i18n.xml
	esup-pstage-web-jsf-servlet/src/main/resources/properties/jsf/navigation-rules.xml
	esup-pstage-web-jsf-servlet/src/main/resources/properties/tags/tags.xml
	esup-pstage-web-jsf-servlet/src/main/webapp/WEB-INF/faces-config.xml
	esup-pstage-web-jsf-servlet/src/main/webapp/WEB-INF/web.xml
	testpush.txt