Fixed some touch issues
Merge branch 'master' of https://github.com/3dtech/frak