1.修改ui相关问题
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
修正无法使用拖拽方式装，卸装备等相关问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修改ui問題相關
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修改運糧介面
字体截断问题
1.占星说明显示出错BUG
1.修正邮件界面BUG（收件箱全选再打开未读邮件，返回后全选打勾邮件列表各项变成没打勾）
1.修正由多点触摸改为单点触摸后经常发生的所有页面点击无响应的问题 2.修正竞技场页面当金币不足的情况下点击增加挑战次数按钮和加速按钮提示错误的问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
军团战信息界面崩溃问题，一些内存引用漏洞，UTF８字符问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.武将招募功能，文字以多语言方式的遗漏
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修改ui相關
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

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