fft and bcbt conf
On Gregoire Behalf Merge remote-tracking branch 'origin/master'

Conflicts:
	main/app/cvz/conf/defaultFiber.ini
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/app/cvz/conf/defaultFiber.ini