modification gui (maquette fini)
Merge branch 'master' of github.com:TIPS-GL/VeloLiberteSante

Conflicts:
	projet2/projet2.pro.user