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

3a0d1ddc5c5b39c9aeeee.

Conflicts:
	src/main/java/net/pms/network/RequestHandlerV2.java
Formatting
Formatting
Revert "Implement Netty version 3.9.0"

This reverts commit 81800cca7d235a108d43a0d1ddc5c5b39c9aeeee.

Conflicts:
	src/main/java/net/pms/network/RequestHandlerV2.java
Updated changelog