合同周俊的代码

合同周俊的代码
修改好友获取巨大量数据的内存问题， 同步周俊的代码

修改好友获取巨大量数据的内存问题， 同步周俊的代码
更新录音的方法， 更新移动运行网代码

更新录音的方法， 更新移动运行网代码
修改移动运行网的api , 优化好友获取列表

修改移动运行网的api , 优化好友获取列表
合并国东代码

合并国东代码
合并国东的代码
合同移动运行网代码

合同移动运行网代码
清除.svn文件

清除.svn文件
修改即时通讯退出登陆后有可能quit app 的问题

修改即时通讯退出登陆后有可能quit app 的问题
修改不能下载图片的问题

修改不能下载图片的问题
Merge branch 'master' of https://github.com/Fanty/bsl-client

Conflicts:
	platforms/ios/bsl.xcodeproj/project.pbxproj
	platforms/ios/bsl.xcworkspace/xcshareddata/bsl.xccheckout
	platforms/ios/bsl.xcworkspace/xcuserdata/fanty.xcuserdatad/UserInterfaceState.xcuserstate
	platforms/ios/bsl/Classes/Core/ServerAPI.m
	platforms/ios/bsl/Classes/Core/cube.xcdatamodeld/cube1022.xcdatamodel/cube0827.xcdatamodel/contents
	platforms/ios/bsl/Classes/XMPP/XMPPIMActor.m
	platforms/ios/bsl/Classes/iPhone/IM/controller/fanty/viewcontrollers/chat/ChatMainViewController.m
	platforms/ios/bsl/Classes/pilot/infrastructure/NSObject+propertyList.h
	platforms/ios/bsl/Classes/pilot/infrastructure/NSObject+propertyList.m
	platforms/ios/bsl/Classes/pilot/util/NSData+Hex.h
	platforms/ios/bsl/Classes/pilot/util/NSData+Hex.m
	platforms/ios/www/img/addmorebutton.ing
	platforms/ios/www/img/addmorebuttonclick.ing
	platforms/ios/www/img/bottom_background.png
	platforms/ios/www/img/bottom_cellcenter.png
	platforms/ios/www/img/bottom_cellleft.png
	platforms/ios/www/img/bottom_cellright.png
	platforms/ios/www/img/click_cellcenter.png
	platforms/ios/www/img/click_cellleft.png
	platforms/ios/www/img/click_cellright.png
	platforms/ios/www/img/nav_back@2x.ing
	platforms/ios/www/img/nav_back_active@2x.ing
	platforms/ios/www/img/navigation_bar.ing
	platforms/ios/www/img/segment_clickright.ing
	platforms/ios/www/img/segment_left.ing
	platforms/ios/www/img/segment_right.ing
	platforms/ios/www/img/settingbutton.ing
	platforms/ios/www/img/settingbutton_click.ing
	platforms/ios/www/img/update_icon.ing
	platforms/ios/移动运行网www/www/phone_old/img/checkbox_empty.png