Merge branch 'master' of https://github.com/Ellyosmark/sofamagico

Conflicts:
	app/design/frontend/default/theme220k/template/page/html/header.phtml
Merge branch 'master' of https://github.com/Ellyosmark/sofamagico

Conflicts:
	app/design/frontend/default/theme220k/template/page/html/header.phtml