Merge pull request #36 from matthewste/master

Mergence of updates
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
Merge pull request #38 from matthewste/master

removal of some testing code that was causing compilation error
Cleanup with new logging method
Merge branch 'master' of github.com:bwoodworth/Open-Source-Automation

Conflicts:
	OSA.Service/OSAEService.cs
RFXCOM updated with new logging
Added all new controls to GUI for adding any control, creating screens, changing screens, etc.
Merge branch 'master' of https://github.com/bwoodworth/Open-Source-Automation

Conflicts:
	GUI2/MainWindow.xaml.cs
	OSA.Service/OSAEService.cs
	OSA.Service/WCF/IMessageCallback.cs
	OSA.Service/WCF/IWCFService.cs
	OSA.Service/WCF/WCFService.cs
	OSAE.API/Images/ImageManager.cs
	OSAE.API/OSAE.cs
	OSAE.API/OSAEObjects/OSAEObject.cs
	OSAE.UI.Controls/AddNewCameraViewer.xaml.cs
	OSAE.UI.Controls/NavigationImage.xaml.cs
	OSAE.UI.Controls/StateImage.xaml.cs
	Open Source Automation.sln