Comiter
Merge branch 'antoine' of https://github.com/piratebreizh/DockAuto into antoine

Conflicts:
	DockAuto.pro.user
Merge branch 'antoine' of https://github.com/piratebreizh/DockAuto into antoine