Merge branch 'develop'
大师傅

的萨芬
Merge branch 'develop'

Conflicts:

CollectionChangedView.xcodeproj/project.xcworkspace/xcuserdata/stephenzh
uang.xcuserdatad/UserInterfaceState.xcuserstate
	CollectionChangedView/Base.lproj/Main.storyboard
	CollectionChangedView/MainViewController.m
啊大大

大声道
爱施德

安师大
add mmm

add mmm
安师大

奥斯丁
Merge branch 'master' into develop

Conflicts:

CollectionChangedView.xcodeproj/project.xcworkspace/xcuserdata/stephenzh
uang.xcuserdatad/UserInterfaceState.xcuserstate
	CollectionChangedView/Base.lproj/Main.storyboard
	CollectionChangedView/MainViewController.m
修复冲突