- remove Joystick
+ added ShipControll
Merge branch 'master' of github.com:DeaDiablo/dev