Web Only Modifications / Team Page Updates
Merge branch 'web-demo' into brandon