Merge pull request #611 from balabhv/vb573

Record settings now working
Reorganized xcode project
Merge remote-tracking branch 'upstream/master' into vb573