final2
Revert "final2"

This reverts commit 80a0270829a02f0b68a88d1071f13b0e1b52658d.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BASE_AG.FDB