'both' filter working on map
Merge branch 'master' of github.com:federicomaffei/WorkMap into job-status
refactoring indexjs
wokring on clustering
Merge branch 'master' of github.com:federicomaffei/WorkMap
completed maps clustering