Merge pull request #87 from ChrisGrant/master

Updates to the JSON files. Removed unnecessary and incorrect properties.
Fixes to the streaming framework to make it compile and to allow the demo app to run.