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

Conflicts:
	mapscene.h
	viewdefinirtache.cpp
	viewdefinirtache.h