slider conflic images.
slider images banner.
Merge pull request #2 from leovir086/feature_x

slider conflic images.
Merge branch 'leovir086-feature_1'