Material Color
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	TLM.v11.suo
	TLM/MainWindow.xaml
	TLM/MainWindow.xaml.cs
no message
Merge remote-tracking branch 'GitHub/dev'