Conflict solve and for new block to resize an image.
Merge pull request #20 from raviosc/developer119

Conflict solve and for new block to resize an image.
Merge pull request #22 from raviosc/developer125

Developer125
Changes for Cart And Search Box1