fixed user image scaling
add channels infrastructure
Fix for subtitles
Merge pull request #808 from 7illusions/master

Fix for subtitles
update FlagsTostring
Restore dlna headers
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
get default profile if needed
Merge pull request #1 from MediaBrowser/master

sync
Merge pull request #2 from MediaBrowser/master

get default profile if needed
DLNA Didl improvements
Merge pull request #809 from 7illusions/master

DLNA Didl improvements
add new web client sidebar
left align web client content
support channel folders
Merge remote-tracking branch 'upstream/master'