Merge commit '47fef47b40ef0efbbaff33c67fb8d8b814185e46' into develop

Some bug fixes and you can now always play a movie
Merge branch 'develop' of https://github.com/leerbedrijflisa/zuma.bluejay into develop