Merging with Gamepad

merged the branches