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

Conflicts:
	LKOA4iPhone/Source/ViewController/LZConfirmViewController.m