conflicts resolved

Update catalog

all resources added to make work protractor easily

Ease protractor use

pagination position
fix