Commit avant Merge
Merge branch 'BrancheWindows' of https://github.com/piratebreizh/DockAuto into BrancheWindows

Conflicts:
	viewmenusimulation.cpp