Merge pull request #3 from MediaBrowser/master

Sync with Master
PS3 DLNA fix
Merge pull request #817 from 7illusions/master

PS3 Dlna fix