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

Conflicts:
	src/com/lkoa/activity/CatalogActivity.java
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git