bug fix
Merge branch 'master' of github.com:bgun/citymaps-sevabot-modules

Conflicts:
	.idea/workspace.xml