STH
Merge branch 'master' of https://github.com/liaojia/LKOA4iPhone

Conflicts:
	LKOA4iPhone.xcodeproj/project.pbxproj
STH
STH
STH
Merge branch 'master' of https://github.com/liaojia/LKOA4iPhone

Conflicts:
	LKOA4iPhone.xcodeproj/project.pbxproj
	LKOA4iPhone/Source/ViewController/XTSZViewController.m
Merge pull request #5 from suntinghui/master

意见反馈