Added screen touch point handler. Refactored handlers.
Merge branch 'JP'