# Conflicts:
#	galaxy/fastlane/Fastfile
#	galaxy/galaxy/Classes/Modules/Community(社区)/C/YHCommunityViewController.swift
合并develop代码