after lots of changes and workshop
Merge branch 'master' of https://github.com/dennisi/GAI-Formula-Model.git into add-geo-map

Conflicts:
	Workbooks/GAI-Formula-Model-Start.twb
	Workbooks/GAI-Formula-Model.twb
Merge branch 'add-geo-map'