Merge pull request #35 from marc-portier/master

reshuffeling the conf.json and adding tests
Added Gruntfile (Only verified that grunt jshint does what it needs to do) + misc work in progress on UI
Merge branch 'master' of https://github.com/karel1980/scratchnet