Merge pull request #66 from liaojia/master

LJ
STH
Merge branch 'master' of git@github.com:suntinghui/LKOA4Android.git
STH
STH
STH
Merge pull request #46 from suntinghui/master

LJ