Merge branch 'master' of https://github.com/B0R1K/Open-Source-Automation

Conflicts:
	OSAE.API/App.config
	OSAE.API/General/Common.cs
	OSAE.API/General/OSAELog.cs
	OSAE.API/OSAEImage/OSAEImageManager.cs
	OSAE.API/OSAEMethod/OSAEMethod.cs
	OSAE.API/OSAEObject/OSAEObjectManager.cs
	OSAE.API/OSAEObjectState/OSAEObjectState.cs
	OSAE.API/OSAEObjectState/OSAEObjectStateManager.cs
	OSAE.API/Plugin/Plugin.cs
	OSAE.API/Plugin/PluginFinder.cs
	Plugins/OSAE.Bluetooth/Bluetooth.cs
	Plugins/OSAE.Email/Email.cs
	Plugins/OSAE.Insteon/Class1.vb
	Plugins/OSAE.Insteon/Insteon.vbproj
	Plugins/OSAE.Jabber/Jabber.cs
	Plugins/OSAE.NetworkMonitor/NetworkMonitor.cs
	Plugins/OSAE.OneWire/OneWire.cs
	Plugins/OSAE.Onkyo/OSAE.Onkyo/Onkyo.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/CmdLets.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/get-osa.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/get-osagcalendar.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/invoke-osa.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/invoke-osalog.cs
	Plugins/OSAE.PowerShellProcessor/CmdLets/invoke-osanma.cs
	Plugins/OSAE.PowerShellProcessor/PowerShellPlugin.cs
	Plugins/OSAE.RSS/RSS.cs
	Plugins/OSAE.Rest/Rest.cs
	Plugins/OSAE.SSH/SSH.cs
	Plugins/OSAE.ScriptProcessor/ScriptProcessor.vb
	Plugins/OSAE.Speech/Speech.cs
	Plugins/OSAE.SqueezeCenter/Class1.cs
	Plugins/OSAE.Twitter/OSAE.Twitter/Twitter.cs
	Plugins/OSAE.WUnderground/WUnderground.cs
	Plugins/OSAE.WebServer/WebServer.cs
	Plugins/OSAE.XBMC/XBMC.cs
	Plugins/OSAE.Zwave/Zwave.cs
	Plugins/OSAE.Zwave/config/fibaro/fgd211.xml
	Plugins/OSAE.Zwave/config/manufacturer_specific.xml
	Services/ClientService/ClientService.cs
	Services/ClientService/ClientService.csproj
	Services/ClientService/app.config
	Services/OSA.Service/OSAEService.HelperCode.cs
	Services/OSA.Service/OSAEService.Networking.cs
	Services/OSA.Service/OSAEService.cs
	UI/Manager/MainWindow.xaml.cs
	UI/Manager/PluginInstallerHelper.cs
	UI/OSAE.UI.Controls/VideoStreamViewer.xaml.cs
	UI/OSAE.UI.Controls/Weather.xaml.cs
	UI/OSAE.UI.Controls/ctrlSelectImage.xaml.cs
	UI/Screens/MainWindow.xaml.cs
	UI/VR2/MainWindow.xaml.cs
	UI/Web/Default.aspx
	UI/Web/Default.aspx.cs
	UI/Web/analytics.aspx
	UI/Web/analytics.aspx.cs
	UI/Web/config.aspx
	UI/Web/debuglog.aspx
	UI/Web/debuglog.aspx.cs
	UI/Web/error.aspx
	UI/Web/eventlogs.aspx
	UI/Web/firstrun.aspx
	UI/Web/images.aspx
	UI/Web/images.aspx.cs
	UI/Web/morePlugins.aspx
	UI/Web/objects.aspx
	UI/Web/objects.aspx.cs
	UI/Web/objtypes.aspx
	UI/Web/objtypes.aspx.cs
	UI/Web/patterns.aspx
	UI/Web/patterns.aspx.cs
	UI/Web/plugins.aspx
	UI/Web/plugins.aspx.cs
	UI/Web/schedules.aspx
	UI/Web/schedules.aspx.cs
	UI/Web/screens.aspx
	UI/Web/scripts.aspx
	UI/Web/scripts.aspx.cs
	UI/Web/valuedisplay.aspx
	UI/Web/valuedisplay.aspx.cs

Former-commit-id: a1f6c6fb8f1235725477c720cae0d9cfffaa78fb
Merge branch 'master' of https://github.com/opensourceautomation/Open-Source-Automation

Conflicts:
	License.txt
	UI/Web/MasterPage.master.cs
	UI/Web/eventlogs.aspx.cs
	UI/Web/logs.aspx
	UI/Web/logs.aspx.cs

Former-commit-id: 715c9be3ed13ab675a34f2e29a9d01fbcb296bab