1. 顶部按钮新手指引错误
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修改字体排版显示，新手指引，图标显示，ui错误等....bug！
小修改
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
占星召唤显示Bug修改
占星装备提示错误Bug修改
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
iOS modify
case sensive
lyol.string更新
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

Conflicts:
	version1.0/ClientLancher/proj.android/src/org/cocos2dx/lib/Cocos2dxActivity.java
背包中星运按钮显示Bug修正
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1.修正角色名字颜色和将星品质不对应的问题2.修正设置中选择不显示其他玩家后不起作用的问题3.修正神秘商店购买数量无限制的问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
1. 修改陣法介面響應問題，修改好友刪除按鈕問題，底部欄新手指引問題，運糧準備頁面響應問題，