Remove the chi number and replace with an NhsNumberType on the demographics object
Merge remote-tracking branch 'origin/release' into release

Conflicts:
	src/main/java/com/solidstategroup/radar/web/panels/DemographicsPanel.java