Added pop up to map fixed bugs with joining and leaving a group
fixed merge