merge
Merge branch 'master' of github.com:DataGarage/dgr-js-tool
dgr-js-tool done