Reorganized xcode project
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #612 from balabhv/vb573

Reorganized xocde project