Slider edit height
Edit pictures in slider
Merge remote-tracking branch 'origin/master' into test
ProductMaker description
Merge branch 'test' into dev