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

Conflicts:
	res/.DS_Store
	res/drawable-hdpi/.DS_Store
STH
Merge branch 'master' of github.com:suntinghui/LKOA4Android
Merge branch 'master' of github.com:suntinghui/LKOA4Android

Conflicts:
	res/.DS_Store
	res/drawable-hdpi/.DS_Store
STH
Merge branch 'master' of github.com:suntinghui/LKOA4Android

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