RENISA
Merge branch 'master' of https://github.com/ansharabdullah/RMS

Conflicts:
	application/models/m_pengingat.php
file renisa punya
OAM
.
Merge branch 'master' of https://github.com/ansharabdullah/RMS

Conflicts:
	nbproject/private/private.xml