web mode added
Merge branch 'master' of github.com:xiaoxinghu/.emacs.d

Conflicts:
	core/xhu-ui.el
	modules/xhu-modules.el