added grunt deps and some small changes to src/widget/dojs/do.js
small conflict fix in README