Expanded filename rewriting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Fixed x264 encoding with MEncoder
Updated changelog