merged svn.

Conflicts:
	Demos/tutorials/ChemicalOscillators/slowFbOsc.py
	mesh/ChemCompt.h