8.5bug修改
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

Conflicts:
	QXH/HomePageModule/Controller/ShareTextController.m