first version of popup event links
Merge branch 'master' of https://github.com/codemkrs-team-name/codemkrs-challenge
map updates for joel
setlocation in map
merge