accidentally put the touch listener on the window, so it conflicted with stuff;
Merge branch 'master' into gh-pages