change by dev20 fir listing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/template/catalog/product/list/toolbar.phtml
changes done by dev20 for listing and toolbar
Merge pull request #21 from raviosc/developer20

change by dev20 fir listing