BFN

Conflicts:
	nag/docs/CHANGES
	nag/package.xml