测试EDE使用
Merge branch 'master' of github.com:zlz3907/emacs.d

Conflicts:
	z-lisp/init-jdee.el