Change in Homepage
Merge branch 'master' of https://github.com/amsjustin/sagra-dell-uva-opencart

Conflicts:
	catalog/view/theme/default/template/common/home.tpl