Zoom in & out fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/html/scripts/anima/map.js