before pull
Merge branch 'master' of https://github.com/martilar/OddJobMapsCloud

Conflicts:
	Resources/ui/common/map.js
jh