Merge pull request #1 from DeFlanko/CONF_Icons_SamsungLink

Conf icons samsung link
Merge pull request #2 from UniversalMediaServer/master

Keeping up
Merge pull request #3 from UniversalMediaServer/master

Keep in sync
Merge pull request #4 from UniversalMediaServer/master

Keeping it updated
Merge pull request #6 from UniversalMediaServer/master

Keeping it updated
Merge pull request #7 from UniversalMediaServer/master

KIS
Merge pull request #9 from UniversalMediaServer/master

keep uptodate
Merge pull request #11 from UniversalMediaServer/master

Keeping up with the hendersons
Merge pull request #12 from UniversalMediaServer/master

Weekly update
Merge pull request #14 from UniversalMediaServer/master

Keeping it updated
Merge pull request #16 from UniversalMediaServer/master

Weekly Update
Merge pull request #18 from UniversalMediaServer/master

Keeping up
Merge pull request #19 from UniversalMediaServer/master

Keeping it updated
Revert "Fixed some web folder titles crashing Samsung TVs (#189)"

This reverts commit 39207b4f646db606091ff057cb042e7cc0e91dde.
Generalize OutputConsumer text filtering + redo ffmpeg duration parsing
Parse and update media info at ffmpeg web playback
Fix indententation
Merge pull request #149 from skeptical/mediainfo

Parse media info at ffmpeg web playback
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Updated changelog