bugfix: use collisionMask properly.
Merge branch 'master' into gh-pages
update: js.