~
Merge branch 'master' of https://github.com/StephenZhuang/MobileNJU
hahahaha
Merge remote-tracking branch 'origin/master' into wangkun_branch_newAPi
自动登陆OK 可注销
Merge branch 'wangkun_branch_newAPi'
Merge branch 'master' of https://github.com/StephenZhuang/MobileNJU

Conflicts:
	MobileNJU/MobileNJU.xcodeproj/project.pbxproj
	MobileNJU/MobileNJU/新闻/NewsListTVC.m
	MobileNJU/MobileNJU/电话/TelephoneInfoVC.m
	MobileNJU/MobileNJU/首页/WelcomeViewController.m
	MobileNJU/ThirdParty/ToolUtils/ToolUtils.h
	MobileNJU/ThirdParty/ToolUtils/ToolUtils.m