web service get address
Merge remote-tracking branch 'origin/master'

Conflicts:
	parshin/map.py