update to latest server code
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser.Plugins

Conflicts:
	MediaBrowser.Plugins.Dlna/packages.config