Cleaning up submodules
Hybrid test changes for iOS
Integrating ContactExplorer into workspace