Merge pull request #1 from qinjian623/dev

Dev
Merge branch 'dev'
Merge branch 'dev'
packages upgrade
Merge branch 'master' of https://github.com/qinjian623/emacs-config into dev