Fix kill stuff
Merge master
Wrap up TextWrap
Formatting
Better comment formatting
Cleanup
Update messages_es.properties

Commit c626fbe93b
Cleanup contd
Update dependecies
Merge pull request #328 from AlfredoRamos/patch-1

Update messages_es.properties
Formatting
Replaced use of TB (top-bottom) with OU (over-under) since it's the more common term on the Internet
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into convert_ASS_to_ASS3D
Merge branch '4.0.0' of github.com:UniversalMediaServer/UniversalMediaServer into convert_ASS_to_ASS3D

Conflicts:
	src/main/java/net/pms/configuration/PmsConfiguration.java
Added debug info
Fix commit 7b9e9d76f895adcd9cc5c1d1598ae36d95e75907
Document the 3D videos naming convention
Update 3D videos support comment