Sync with master
Merge remote-tracking branch 'UMS/master' into 3D_subs_support

Conflicts:
	src/main/java/net/pms/encoders/FFMpegVideo.java
Do not make 3D subtitles for anaglyph 3D videos
Improve external subs streaming
Changed the default maximum bitrate to 90

Hopefully this strikes a better balance between network speed and CPU usage, since 110 was causing the occasional network bottleneck on 100Mb/s connections
Another french update ヽ༼ຈل͜ຈ༽ﾉ
Enabled automatic updating to 4.1.2 on Windows
Updated changelog
Merge pull request #379 from Kirvx/patch-5

Another french update ヽ༼ຈل͜ຈ༽ﾉ
Try to fix Xbox One support
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Make the fix for LG TVs more common
Added more strings sent by Xbox One
Quick fix for Samsung thumbnails
Fix play page html
Prevent literal parsing of logged html snippets in browser
Removed unused imports and set serialVersionUID when needed
Updated the program icon
Minor logo updates
Added a space before {External Subtitles}