khairul
Merge branch 'master' of https://github.com/KawalKawal/kawalmenteri

Conflicts:
	kawal-kabinet/nbproject/private/private.xml