New simulation parameters.
Merge remote-tracking branch 'origin/master' into marcos

Conflicts:
	tlm/core/simulation.py