removed the local trailer plugin
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.Plugins
update components
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.Plugins

Conflicts:
	MediaBrowser.Plugins.ArgusTV/packages.config