small edit to location model
resolve conflicts
add a new image to the search index view