new value to columnType added
IndividualTemplate removed - changes to the switch to ColumnMapping

most mappings replaced by columnType, ColumnRef from DemographicMapping
moved to Demographic

Need to clean up