Upgraded existing node dependencies (especially grunt-related)
Merge remote-tracking branch 'origin/v0.3.2-release' into v0.3.2-release

Conflicts:
	.idea/workspace.xml
Upgraded existing node dependencies (especially grunt-related)
Upgraded existing node dependencies (especially grunt-related)