Slider edit
Merge remote-tracking branch 'origin/Add_instamini' into Add_instamini

Conflicts:
	index.php