Added photo collection to map
Added popup for image collection
Solved merge conflict