in progress
Merge branch 'auto_play' of
https://github.com/rturknett/MassivePixelEnvironment.git into auto_play

Conflicts:
	examples/MPEPeasy/data/configuration_stallion_1.xml