Merge branch 'master' into windows-icons

Conflicts:
	tasks/lib/compress.js
	tasks/node_webkit_builder.js