Conflicts:
	doc/conf.py.in
	doc_cn/conf.py.in
	doc_theme/static/css/override.css
	doc_theme/static/js/paddle_doc_init.js
	doc_theme/templates/layout.html