sync
Merge branch 'master'

Conflicts:
	Empty Application/AudioPlayer.xcodeproj/project.pbxproj
	Empty Application/Empty Application/ViewController.m
	UF/UF.xcodeproj/project.xcworkspace/xcshareddata/UF.xccheckout