Potensi LKPM
Merge branch 'master' of https://github.com/egiw/BKPM

Conflicts:
	application/default/views/scripts/diklat/index.phtml
	application/default/views/scripts/lkpm/index.phtml