Nightly build fixes and version updates.
Merge branch 'master' into system-utils-refactoring

Conflicts:
	src/main/java/net/pms/encoders/PlayerFactory.java