Fixed click events leaking through hammer tap events
Merge remote-tracking branch 'origin/dev'