Compile
Merge branch 'master' into dev

Conflicts:
	result/d3.user.js
	result/pack.version.json
Compile