Updated Flickr access
Merge branch 'develop'