Modif quelquonque que que
Merge branch 'master' of https://github.com/P1gu/Porte-Drone

Conflicts:
	Client/src/ch/emf/portedrone/ctrl/Ctrl.java
	Client/src/ch/emf/portedrone/ctrl/ICtrlWrk.java
	Client/src/ch/emf/portedrone/ihm/IIhmCtrl.java
	Client/src/ch/emf/portedrone/ihm/pc/IhmPC.java