Merge branch 'master' of https://github.com/Hexanome4202/test_devoo

Conflicts:
	src/vue/Fenetre.java
Merge branch 'master' of https://github.com/Hexanome4202/test_devoo

Conflicts:
	src/vue/Fenetre.java
Merge branch 'master' of https://github.com/Hexanome4202/test_devoo