Added Grunt to the project
Merge branch 'master' of https://github.com/johanpoirier/office-dashboard

Conflicts:
	package.json