0
Merge branch 'master' of https://github.com/xiechao06/Flask-Report

Conflicts:
	flask_report/messages.pot
	flask_report/translations/zh_CN/LC_MESSAGES/messages.po