ya
h

n
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	system/cache/cache.language.1413481230
	system/logs/error.log