Fixed some merge bugs
Merge branch 'master' of https://github.com/jansmolders86/mediacenterjs
Fixed some merge bugs