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

Conflicts:
	LKOA4iPhone.xcodeproj/project.pbxproj
Merge pull request #4 from suntinghui/master

zhu jiemian tiao zhuan