improve initialization of flickr API key
Merge branch 'master' into production