Several sp fixes
more fixes
Merge branch 'develop_fixes' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_fixes
Merge branch 'refs/heads/mano3m-develop_fixes' into develop
Merge branch 'refs/heads/develop' into desktop
Small one up