added location fields
modified select method
mapping of demographics
demographics mapping
clearing fields
Merge branch 'demographics'