enlever le <<<<<<<head
Merge branch 'master' into dev_JeePee

Conflicts:
	ForkliftControl_CmdLine/Program.cs
Merge pull request #4 from ideaLduK/master

Master to Mat