Better touchscreen swiping
Merge branch 'master' into gameplay