Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer

Conflicts:
	src/main/java/net/pms/encoders/FFMpegVideo.java
Merge remote-tracking branch 'UMS/master' into ffmpeg_subs