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

Conflicts:
	nbproject/private/private.xml
RENISA
Merge branch 'master' of https://github.com/ansharabdullah/RMS