prepare for BAE
Merge branch 'master' of https://github.com/zyxstar/markdown2page

Conflicts:
	popup/web.html
	res/js/routelang.js
	server/home.py
	server/home.pyc
	server/static/applet/ReadMe.html
	server/static/popup/lang.html
	server/static/popup/web.html
	server/templates/gen_md.html
	server/templates/index.html
	server/templates/popweb.html