Mise en place de test sur les dates
modification css
Merge branch 'master' of https://github.com/geeknbar/projetEDT

Conflicts:
	src/resources/package_en.properties
	src/resources/package_fr.properties
Merge conflit