Merge branch 'master' of 192.168.9.14:dhsgclient-x

Conflicts:
	version1.0/ClientLancher/proj.android/src/org/DeNA/DHLJ/DaHuaLongJiang.java
Merge remote-tracking branch 'origin/HEAD' into android_TW

Conflicts:
	version1.0/ClientLancher/proj.android/src/org/DeNA/DHLJ/DaHuaLongJiang.java