event.clientX to x
touch event for pad
Merge branch 'master' into gh-pages