CHANGELOG.txt updated
Merge branch 'master' of github.com:ps3mediaserver/ps3mediaserver