attempt to make touch events call button functions
Merge remote-tracking branch 'origin/master'