x
Merge branch 'master' of https://github.com/pisceanfoot/xSimulate

Conflicts:
	Source/xSimulate.UI/MainFrm.Designer.cs