Fixing all of that!

Semangat
dbakut

sad
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/cache/cache.language.1414055456
Merge branch 'master' of https://github.com/dream-akasa/sman1kutasari

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