Merge pull request #37 from melodylhsy/master

Event list page bug fixed & options on my events added
minor bug fixed in event list