mapItems on map
Merge branch 'master' into dcsan
ticker working
tweak