Lj
Merge branch 'master' of https://github.com/liaojia/LKOA4Android into liaojia-master

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