Merge branch 'develop' of https://github.com/robworth/patientview into PR-149-RPV-Graphs

Conflicts:
	patientview-parent/patientview/src/main/java/org/patientview/patientview/TestResultsAction.java
	patientview-parent/patientview/src/main/java/org/patientview/repository/TestResultDao.java
	patientview-parent/patientview/src/main/java/org/patientview/service/TestResultManager.java
	patientview-parent/patientview/src/test/java/org/patientview/test/repository/ResultHeadingTest.java