update croquis.js
merge