merge master
Merge remote-tracking branch 'origin/client-dev'
Merge remote-tracking branch 'origin/master'
merge web site
Add Grunt
Add Grunt-cli
merge grunt
Merge pull request #32 from theodi/client-dev

Merge grunt