add location model
update controllers to use locatio model methods
fix merge conflicts in districts controller
Merge pull request #5 from AirDisa/location_model

add location model