Merging into master

and almost perfect node app, enough to start the full version of mean stack