stuff
Merge branch 'master' of github.com:paratrooper5730/vgl2

Conflicts:
	catalog/view/theme/valgalla/template/common/header.tpl