* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  web详情页面点赞收藏

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj