Add "main" entry to package.json.
Merge branch 'develop'