Integrated map into main page; list of venues updates with map
Fixed merge conflicts