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

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