pagePays pageMaladie pagelisteMaladie pageEditerMaladie
Merge branch 'master' of github.com:ThomasDeudon/NuitInfo-2014

Conflicts:
	src/Acme/SiteBundle/Resources/config/routing.yml