Merge pull request #1 from fywb251/master

更新代码
合并

合并
合并主干代码

合并主干代码
Merge branch 'fywb251-bsl_impc1024' of https://github.com/fanty2/bsl-client

Conflicts:
	platforms/ios/bsl copy3-Info.plist
	platforms/ios/bsl.xcodeproj/project.pbxproj
	platforms/ios/bsl.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
	platforms/ios/bsl.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	platforms/ios/bsl.xcworkspace/xcuserdata/fanty.xcuserdatad/UserInterfaceState.xcuserstate
	platforms/ios/bsl/Classes/Core/cube.xcdatamodeld/.xccurrentversion
	platforms/ios/bsl/Classes/iPhone/IM/controller/fanty/logic/ChatLogic.m
	platforms/ios/bsl/Classes/iPhone/WebView/MainView/Main_IphoneViewController.m
	platforms/ios/bsl/Resources/Add_Module_Icon.png
	platforms/ios/bsl/Resources/images/menu_selected.png
	platforms/ios/www/img/bottom_cellleft.png
	platforms/ios/www/img/click_cellleft.png
	platforms/ios/www/pad/js/main.js