added dynamic city label and added geolocation to photo
fixed merge conflict with project file