pull
Merge branch 'master' of https://github.com/TRWirahmana/hukor

Conflicts:
	public/assets/counter.xml
logic edit berita, resolved
Merge branch 'master' of https://github.com/TRWirahmana/hukor