SALEFRONT-58: Apply header and footer theme/layout for other pages - updates 1
Merge branch 'master' of https://github.com/aldrin15/supercms
SALEFRONT-58: Apply header and footer theme/layout for other pages - updates 2
Merge branch 'master' of https://github.com/aldrin15/supercms

Conflicts:
	_assets/css/style.css