Update Package.json file.
Package.json update.
Merge branch 'master' of https://github.com/fassetar/grunt-workspaces

Conflicts:
	package.json