added activity link
merge
added activity click and map centered to activity marker
resolved merge conflicts