修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/pluggable-amd.js
	dist/pluggable-amd.min.js
	dist/pluggable-amd.min.map
	lib/css-load.js
	lib/events.js
	lib/file-dependence.js
	lib/file-load.js
	lib/load-config.js
	lib/module-base.js
	lib/module-dependence.js