[work] Updated 2013-12-08 for daily work.
Merge branch 'master' of https://github.com/zjunweihit/vimwiki

Conflicts:
	_wiki_html/Linux_env.html
	_wiki_html/style.css