Fixed InputManager for two joysticks, two analog sticks on each, and one button on each
Merge branch 'master' of https://github.com/laaph/candy