Multi-touch fixes
Merge branch 'master' of github:slembcke/Disasteroids2