update package.json
merge develop
update scanner