Grunt testing
NodeJS with Express
Merge branch 'master' into feature/web-project