-下拉放大效果好了
-下拉放大效果好了
Merge remote-tracking branch 'origin/develop' into HEAD

Conflicts:
	Sauntter.xcworkspace/xcuserdata/Tian.xcuserdatad/UserInterfaceState.xcuserstate
	Sauntter/LeftCenterRightViewControllers/CenterViewControllers/Center_StoryViewController.m
	Sauntter/LeftCenterRightViewControllers/CenterViewControllers/Center_StoryViewController.xib
	Sauntter/LeftCenterRightViewControllers/StoryEditorViewController/CustomCollectionView.m
Merge branch 'develop' of https://github.com/Superoryco/Sauntter-APP-iOS into develop

Conflicts:
	Sauntter.xcworkspace/xcuserdata/Tian.xcuserdatad/UserInterfaceState.xcuserstate
	Sauntter/LeftCenterRightViewControllers/CenterViewControllers/Center_StoryViewController.m
	Sauntter/LeftCenterRightViewControllers/CenterViewControllers/Center_StoryViewController.xib
	Sauntter/LeftCenterRightViewControllers/StoryEditorViewController/CustomCollectionView.m