Commenting some more.
Merge remote-tracking branch 'origin/testbranch' into lemsSimulation

Conflicts:
	simulation.xml
Merge remote-tracking branch 'origin/lemsSimulation'

Conflicts:
	simulation.xml