Merge branch 'master' into develop
Move modules from node_modules to src.
Merge branch 'feature/move-modules'