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

Conflicts:
	src/com/lkoa/activity/CatalogActivity.java