Added a class for the joystick controller
Merge branch 'dev_AO' into dev
Merge branch 'dev_LA' into dev
Control fix