Merge branch 'release/1.1' into develop
Adds a route to the demo video
Merge branch 'master' into develop