merging
Merge branch 'master' of https://github.com/adry84/mipcube2013

Conflicts:
	VideoSwitcherMIP/MainWindow.xaml
	VideoSwitcherMIP/obj/Debug/MainWindow.g.i.cs
	VideoSwitcherMIP/obj/Debug/VideoSwitcher.csproj.FileListAbsolute.txt