STH
Merge pull request #46 from liaojia/master

pull
Merge pull request #47 from liaojia/master

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

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

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

pii