Demo updates
Merge branch 'master' of https://github.com/lithiumtech/linc-sony-demo