hh
Merge branch 'newdev' of https://github.com/nosfik/proj01 into newdev

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