add map view to display events
merge master