test
Merge branch 'master' of https://github.com/PySimulator/PySimulator
Fixes #14
Merge branch 'master' of https://github.com/PySimulator/PySimulator
Merge branch 'master' of https://github.com/PySimulator/PySimulator into SimulationX

Conflicts:
	PySimulator/Plugins/SimulationResult/Mtsf/pyMtsf.py