conflicts resolved

module sdcoServices added

Update catalog

Update from Step6

clean up automatic comments

all resources added to make work protractor easily

Ease protractor use

retrieve from step7_bis
fix