guhuazhen 修改info里的信息有用，其他的用阿得修改的
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/PublicController.php
	protected/models/Caiji.php
	protected/models/CaijiArticle.php
	protected/models/CaijiGuize.php
	protected/models/Score.php
	protected/models/UserScore.php