Add Public_Activity for comments
fix merge conflicts
fix conflicts
fix conflicts
Merge branch 'master' of https://github.com/Prometheus-uu13/KnowledgeThief
sddsds`