Merge branch 'feature-stat-name'
new map
new map
Merge branch 'faeture-new-map' into develop