Merge branch 'release/1.0.0'
Add node_modules to gitignore
Merge branch 'master' into release/1.1.0
Merge branch 'release/1.1.0' into develop