区分大小写
Merge branch 'master' of https://github.com/qdayy/bai2.org

Conflicts:
	Bai2/Common/Conf/config.php