changed /stream to /screen - for some reason this broke the /stream.json on live environment
Merge branch 'master' into stable