Parameters for custom run
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainWindow.xaml
	UserControls/CustomRun.xaml