#启动过程加log; 小修改纠正SetFrameRect错误用法.
切换账号崩溃问题
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW

Conflicts:
	VERSION1.0/ClientLogic/GameScene/src/SMLoginScene.cpp
	version1.0/ClientLancher/proj.android/src/org/DeNA/DHLJ/DaHuaLongJiang.java
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.修改当前版本号
1.更换资源等
1.安卓繁体版更新公告更新
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
Push通知增加世界广播
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
rollback之前的错误修改；输入法小修改
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
小修改
1.修改ini资源等
Merge branch 'android_TW' of 192.168.9.14:dhsgclient-x into android_TW
删除小写的CCCommon.cpp