Ready for demo
save change
Merge branch 'master' of https://github.com/hcilab-um/STim

Conflicts:
	Src/STimWPF/Controls/ContentControl.xaml
	Src/STimWPF/Controls/ContentControl.xaml.cs