Merge remote-tracking branch 'robworth/develop' into 129--DB-XML-Add-diabetes-general-data

Conflicts:
	patientview-parent/common/src/main/resources/current-db-feature-num.txt
	patientview-parent/common/src/main/resources/sql/features/24/24.sql
Correct the typo

Correct the typo in script.