增加Java　Application配置，绕过package问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
修正在行囊页面拖动装备且同时多指拖动其他滚动控件会在页面上留下一个装备图标的问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
DaHuaLongJiang修改资源目录　
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.eclipse编译问题
修正半屏输入框挡住梦宝谷图标的问题
将多点触摸改为和IOS版本一致的单点触摸
#修复视频播放返回卡住问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW

Conflicts:
	version1.0/ClientLancher/proj.android/AndroidManifest.xml
	version1.0/ClientLancher/proj.android/src/org/DeNA/DHLJ/DaHuaLongJiang.java
补充
#删除临时代码@del
修正点击寻路引导角色走到正确的NPC旁边但弹出的NPC对话框错误的问题
路径修改
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
小修改
1.NPC名字显示位置相对NPC固定不动，
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW