Viewmodel updated
Merge branch 'master' of https://github.com/jstadnicki/NML

Conflicts:
	NML/MainWindow.xaml
	NML/NML.csproj