Fix kill stuff
Merge master
Wrap up TextWrap
Formatting
Better comment formatting
Cleanup
Cleanup contd
Update dependecies
Merge branch '4.0.0' of github.com:UniversalMediaServer/UniversalMediaServer into convert_ASS_to_ASS3D

Conflicts:
	src/main/java/net/pms/configuration/PmsConfiguration.java