Remove node_modules from repo
Merge branch 'master' into develop