Changes for Product slider
conflict solve
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/template/catalog/product/list_featured_slider.phtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/template/catalog/product/list_featured_slider.phtml
Merge pull request #64 from raviosc/developer125

Developer125