merged with everything
msg tst
Merge branch 'master' of https://github.com/mehdif/OptimodLyon.git

Conflicts:
	src/controleur/Application.java
	src/vue/VueDetail.java
	src/vue/VueMenu.java
	src/vue/VueReseau.java
Last version