HOTFIX: change hardcoded demo links to match flavor slugs
Merge branch 'staging'