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

Conflicts:
	LKOA4iPhone.xcodeproj/project.pbxproj
	LKOA4iPhone/LKOA4iPhone-Prefix.pch
STH
sth
Merge pull request #1 from suntinghui/master

合并