Location model fixed.  Load existing data function added to rest_servcices.py
Some updates based on changed model
Merge commit 'f434b46f802a1bbb3f1261cbfd4a26d0bd6ca454'

Conflicts:
	site/reclaimcities/apps/web/models.py
More model updates