Merge branch '0.3' into renamingAndroid
Renaming HPHybridCatalog android to CobaltCatalog
Merge branch 'renamingAndroid' into 0.3