golf_no_sync_branch
Merge branch 'golf_no_sync'

Conflicts:
	UISliderChangeValue/ViewController.m