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

Conflicts:
	res/.DS_Store
	res/drawable-hdpi/.DS_Store
Merge pull request #58 from liaojia/master

LJ
Merge pull request #59 from liaojia/master

历史nodata
STH
Merge branch 'master' of github.com:suntinghui/LKOA4Android
Merge pull request #60 from liaojia/master

splash
Merge branch 'master' of github.com:suntinghui/LKOA4Android

Conflicts:
	res/.DS_Store
	res/drawable-hdpi/.DS_Store
Merge pull request #61 from liaojia/master

splash
Merge pull request #62 from liaojia/master

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

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

LJ