Map gamepad -add stopWinch
Merge branch 'develop' into testing