hexgrid_impl.js and clientmodel.js
Merge remote-tracking branch 'upstream/master'