made changes or updates
changes made
changes made
Changes been made
changed
changes made
changes made
trial
changes made
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/nbproject/project.properties
	Integrated Project/Gauteng MMS/src/java/database/Recipient.java
	Integrated Project/Gauteng MMS/src/java/database/TestApp.java
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/DeceasedAddressContent.jsp
	Integrated Project/Gauteng MMS/web/DeceasedDetailsContent.jsp
	Integrated Project/Gauteng MMS/web/Home.jsp
	Integrated Project/Gauteng MMS/web/OpenBodyFileContent.jsp
	Reports/Reports_PDF/build/built-jar.properties
	Reports/Reports_PDF/nbproject/private/private.properties
	Reports/Reports_PDF/nbproject/project.properties
	Reports/Reports_PDF/src/jcse/coachlab2013/mms/reports/DbDetail.java
changes made
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
changes made
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Reports/Reports_PDF/nbproject/private/private.properties