Merge pull request
file not present on localhost
file not present on localhost
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'