Use gender/ethincity lookuplists.

refs openhealthcare/elcid#443
refs openhealthcare/opal-research#46
Update location modal to display category correctly
Add elcid discharge