deleted Redirect
Merge branch 'josh-dev' into Live