pidan / FuSiLive

* 'feature/私讯+座驾体系' of http://git.yabolive.net:88/pidan/FuSiLive:
  完成完善用户资料页面
  补充
  需要添加一个pod 'SJAttributesStringMaker' #富文本Swift，这个版本还不能编译，仅仅是为了pod之前保存
  完成通话设置的页面

# Conflicts:
#	Podfile.lock
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-FUSChatCenterModule/Pods-FUSChatCenterModule.debug.xcconfig
#	Pods/Target Support Files/Pods-FUSChatCenterModule/Pods-FUSChatCenterModule.release.xcconfig
#	Pods/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule.debug.xcconfig
#	Pods/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule.release.xcconfig
#	Pods/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.debug.xcconfig
#	Pods/Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.release.xcconfig
#	Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig
#	Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive.release.xcconfig