Merge branch 'dyx' of github.com:xiaoshizhishijingsai/1.0

Conflicts:
	XiaoShi/controller/main.php
	XiaoShi/model/DB.php
Merge branch 'master' of github.com:xiaoshizhishijingsai/1.0

Conflicts:
	XiaoShi/model/DB.php
Merge branch 'master' of github.com:xiaoshizhishijingsai/1.0