Kegiatan Terkini & others

Navigasi admin, kegiatan terkin.
Merge remote-tracking branch 'origin/master'

Conflicts:
	catalog/view/theme/default/template/common/header.tpl
	system/cache/cache.language.1412914244
	system/cache/cache.language.1412930834
	system/cache/cache.language.1412935405