Updated changelog
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer

commit c937d1027bb46ab6b6b9e7f283d052de4aa80aee, reversing
changes made to 5d357795067cb3321d3459dcb141f5d1632388e0.

Conflicts:
	src/main/external-resources/nsis/pms.nsi
	src/main/external-resources/nsis/setup.nsi
	src/main/java/net/pms/PMS.java
Formatting
Updated changelog
Official release of 3.1.1 for Windows and Linux