Branch test
content background changes
home indeling update
update menu
Merge branch 'Justin-Branch'

Conflicts:
	catalog/view/theme/default/template/account/account.tpl
	html/assets/css/style.css
	system/logs/error.txt