Fix version number in package.json
Merge remote-tracking branch 'origin' into dev