Updated database dump called "MMS_Dump20130521" and some changes to the kin jsp page
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/KinInformantDetailsContent.jsp
	Integrated Project/Gauteng MMS/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/nbproject/project.properties
	Integrated Project/Gauteng MMS/web/KinInformantDetailsContent.jsp