Added timer label and WCF Message object
Cleanup
Merge branch 'master' of github.com:bwoodworth/Open-Source-Automation

Conflicts:
	GUI2/MainWindow.xaml.cs
	Manager_WPF/MainWindow.xaml.cs
	OSA.Service/OSAEService.cs
	OSA.Service/WCFService.cs