Formatting
Updated changelog
Merge remote-tracking branch 'UMS/master' into Panasonic_subs

Conflicts:
	src/main/java/net/pms/formats/v2/SubtitleUtils.java