Check if the subs file was changed and reencode it to ASS
Layout tweak
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix

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