import

import project
add collection

add collection
Merge branch 'develop'

Conflicts:

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

大声道
爱施德

安师大