Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git

Conflicts:
	src/com/lkoa/activity/CatalogActivity.java
Merge pull request #19 from suntinghui/master

LJ
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git
Merge pull request #29 from liaojia/master

LJJ