Merge pull request #12 from suntinghui/master

jia
ss
Merge branch 'master' of github.com:liaojia/LKOA4iPhone

Conflicts:
	LKOA4iPhone.xcodeproj/project.pbxproj
Merge pull request #18 from liaojia/master

ss