mega event details changed
conflicts removed
Merge pull request #174 from sunnyLA4/master

mega event details changed