Merge remote-tracking branch 'origin/Macros'

Conflicts:
	Calculation classes/TriBPoint.rbbas
	Other Classes/Configuration.rbbas
	Windows/Formswindow.rbfrm
	Windows/WorkWindow.rbfrm
Merge branch 'master' of https://github.com/CREM-asbl/AG2