Update package.json version
Merge branch 'develop'