Fixed test
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer

Conflicts:
	src/test/java/net/pms/configuration/RendererConfigurationTest.java