Merge pull request #31 from ovidiuiliescu/2.4-preparation

Added support for focus via touch. Improved touch event support (in part...
Merge remote-tracking branch 'enough-origin/2.4-preparation' into 2.4-preparation