added profile image & fixed map issue
fixed merge conflict
Merge pull request #35 from AndroidTresLeches/event_feature

Event feature