Commit xib
Merge branch 'test_conflict_xib'

Conflicts:
	UISliderChangeValue/ViewController.m