Improved touch controls.
Merge remote branch 'origin/master' into newtouch