Add joystick support
Update to todo.txt
Merge branch 'master' of https://github.com/nettercm/trinity.git