Merge branch 'master' of https://github.com/dream-akasa/sman1kutasari

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