develop taphold
main.js
-Enable taphold events
-Bugfix
Merge remote-tracking branch 'origin/js_dev'

Conflicts:
	css/style3.css