Added Flickr
Merge branch 'flickr' into develop