node_modules added to the files, some corrections added due to c9

Signed-off-by: Julien Blatecky <julien1619@gmail.com>
Unknown git bug
Merge remote-tracking branch 'origin/master' into Prototype2