add animation for view change
Merge branch 'master' of https://github.com/Charlesjean/ColorPickerViewTest

Conflicts:

ColorPickerViewTest.xcodeproj/project.xcworkspace/xcuserdata/chenduanjin
.xcuserdatad/UserInterfaceState.xcuserstate

ColorPickerViewTest.xcodeproj/xcuserdata/chenduanjin.xcuserdatad/xcdebug
ger/Breakpoints.xcbkptlist
commit animation