File encoding weirdness
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into PMS

Conflicts:
	src/main/external-resources/renderers/BlackBerryPlayBook-KalemSoftMP.conf
Fixed possible race condition causing broken playback

Based on https://github.com/ps3mediaserver/ps3mediaserver/commit/18edeaf82719100b7185ea35eafcbb6da000a136
Added useful debugging information

From https://github.com/ps3mediaserver/ps3mediaserver/commit/f2a35eb81d129d3c3e55bd8b13b152c4f2eb618a
Merge pull request #109 from UniversalMediaServer/PMS

Pms