Changes to be committed:
	modified:   ../conductor/conductorelements.py
	modified:   ../shared/config.py