merge define
Merge branch 'master' of https://github.com/NetEaseWD/NEJ.git

Conflicts:
	src/define.js