Esthétique_2
Merge branch 'master' of https://github.com/jaoued/jobtraining

Conflicts:
	src/View/PanelDashboardAdmin.java