Fix bug in collision, add joystick property store

- Created stub for new complex control demo