Merge pull request
file not present on localhost
file not present on localhost
Merge pull request #32 from raviosc/developer125

Developer125
changes done by dev20 for home static blocks
Merge pull request #33 from raviosc/developer20

changes done by dev20 for home static blocks
changes done by dev20 for static block
Merge pull request #34 from raviosc/developer20

changes done by dev20 for static block
changes done by dev20 for static block of homepage
Merge pull request #35 from raviosc/developer20

changes done by dev20 for static block of homepage
changes done by dev20 for listing
Merge pull request #36 from raviosc/developer20

changes done by dev20 for listing
change for listing
Merge remote branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/layout/local.xml
	app/design/frontend/ultimo/default/template/page/html/pager.phtml
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
unwanted images
Merge remote branch 'origin/master'