Use grunt-init-noflo structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	component.json
	package.json