fixed simultaneous zoom and click bug
updated all htmls
Merged remote-tracking branch 'upstream/master'

Conflicts:
	coin/index.html
Merge pull request #284 from jpecht/master

updated all htmls