joystick support added
Merge branch 'development'