Jame & Toan || Feature Added: Users can comment on posts of events
fixed merge conflicts