nb configuration
Merge branch 'master' of https://github.com/GII/MDB

Conflicts:
	DelayedANN/nb-configuration.xml