Merge branch 'refs/heads/0005-movements'
different event handling for touch