Improvement in the configuration.
Merge branch 'tmpwork'

Conflicts:
	python/zbbConfig.py