Fix number of projects in map
Merge branch 'dev' into staging