vConcurso
Merge branch 'master' of /home/christian/Repos/Geo_Aggs-Map into proj

Conflicts:
	DB/Aggregations.hdbview
	DB/Sales.hdbtable
	UI/index.html
	UI/src/map_init.js
	UI/src/ui5_components.js