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

Conflicts:
	LKOA4iPhone/Source/ViewController/XXZXViewController.m
Merge pull request #16 from suntinghui/master

d