New template to pick images from Flickr
Solved conflicts