update gitignore
Merge branch 'ignore' into develop
update package.json
Merge branch 'develop'