change by dev200 for toolbar and pager
conflict solve and delete unwanted folders
for toolbar
conflict solve
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/template/catalog/product/list/toolbar.phtml
	app/design/frontend/ultimo/default/template/page/html/pager.phtml
	skin/frontend/ultimo/default/css/home.css
Merge pull request #38 from raviosc/developer20

change by dev200 for toolbar and pager