Updated TODO
Switched to adaptive joystick for touch control
Merge branch 'master'