Merge branch 'release/1'
Fixed package.json
Merge branch 'hotfix/hotfix1' into develop