调整依赖解析的方法
Merge commit '552e2d1'

Conflicts:
	src/node/require.js
	test/node/requireSpec.js