Merge branch 'master' of github.com:jack11/guangda

Conflicts:
	ThinkPHP/guangda/Home/Model/InformationModel.class.php