Fixed merge issues
[sdc.git] / catalog-ui / src / app / ng2 / components / ui / search-bar /
2017-12-10 Tal GitelmanFinal commit to master merge from 87/25987/2