[Env] Updated firefox update for Ubuntu12.04
Merge branch 'master' of https://github.com/zjunweihit/vimwiki

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