merge hammerjs:master