Merge branch 'custom-view-animation'

Conflicts:
	Slider.xcodeproj/project.pbxproj