update package.json
merge develop
update scanner
update config.js
Merge pull request #1 from liangji101/develop

update scanner