Stopped the waiting for undefined tools
Merge branch 'master' into feature/Handlebars
handelbars.js node and client , test finished