最后添加
添加修改
去掉tablebar
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

Conflicts:
	QXH.xcodeproj/project.pbxproj
	QXH/AppDelegate.m
	QXH/HomePageModule/Controller/ShareTextController.m
	QXH/Information/Controller/InformationDetailController.m
	QXH/PersonalModule/Controller/MyCardController.m
	QXH/PersonalModule/Controller/SchoolInfoController.m
	QXH/PersonalModule/Controller/SettingViewController.m