diklat sebaran jumlah dan status
Merge branch 'master' of https://github.com/egiw/BKPM

Conflicts:
	application/default/views/scripts/demografi/index.phtml
	application/default/views/scripts/diklat/index.phtml
	application/default/views/scripts/index/dashboard.phtml
diklat status renewed
Merge branch 'master' of https://github.com/egiw/BKPM