merging with develop
added filtering to map
all
added customer markers
Merge branch 'feature/map_canvas' into develop