PUSH
Merge remote-tracking branch 'origin'
Merge pull request #72 from liaojia/master

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

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

lj