conflicts resolved

module sdcoServices added

Update Catalog

clean up automatic comment

all resources added to make work protractor easily

Ease protractor use

reduce fake diffs

retrieve from step5_bis
fix