pull master
update
Merge branch 'master' of github.com:zlz3907/emacs.d

Conflicts:
	z-lisp/init-zorg-exportpdf.el
fixing jdee complete