Merge pull request #1 from mrmicjam/map_api_call

Map api call
Merge pull request #1 from mrmicjam/map_api_call

invitations and comments
Update settings.py
Merge pull request #2 from mrmicjam/map_api_call

Map api call
update settings
Merge branch 'master' of github.com:mrmicjam/iD_django into map_api_call
Merge branch 'master' of github.com:cronkite-asu/iD_django into cronkite-asu-master

Conflicts:
	iD_django/settings.py
Merge branch 'cronkite-asu-master' into map_api_call