format
Merge branch 'master' of https://github.com/hulufei/workflow-vips

Conflicts:
	Gruntfile.js