updates
Merge branch 'map_api_call' of github.com:mrmicjam/iD_django into map_api_call

Conflicts:
	iD_django/settings.py