conflicts fix
Merge pull request #1 from AceChenX/master

replace sliding image
fix bug for partners-slider
fix develop conflict