first
second
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ukrpromspets/ukrpromspets/template/page/html/footer.phtml
secondq1