Merge pull request #78 from agoenergy/54-design-of-the-map-template

Merge pull request #78 from agoenergy/54-design-of-the-map-template #20