Fixing the deployment
Merge branch 'master' into deploy
Fixing merge conflict
Adding showing of topics
Merge