Serveral bugfixes
Merge branch 'master' of https://github.com/jansmolders86/mediacenterjs