Fixin lagi
fix
Testimonial

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

Conflicts:
	system/logs/error.log
Merge branch 'master' of https://github.com/dream-akasa/sman1kutasari

Conflicts:
	catalog/model/catalog/information.php
	catalog/view/theme/default/template/common/header.tpl
	system/cache/cache.language.1413792980