Version stable sans les pilotes MySQL
Merge branch 'brancheAlex' into BrancheWindows

Conflicts:
	DockAuto.pro
	DockAuto.pro.user
	FenetrePrincipale.cpp
	FenetrePrincipale.h
	robot.h
	viewcreationrobot.cpp
	viewcreationrobot.h
	viewgestionequipe.cpp
	viewgestionequipe.h
Merge branch 'BrancheWindows' of https://github.com/piratebreizh/DockAuto into BrancheWindows

Conflicts:
	DockAuto.pro
	FenetrePrincipale.cpp
	FenetrePrincipale.h
	robot.h
	viewcreationrobot.cpp
	viewcreationrobot.h
	viewgestionequipe.cpp
	viewgestionequipe.h