First batch of merges from other product
Second batch of updates from the other project
Finished merging changes from other project
Added 'repository' to package.json