no flickr
Merge branch 'master' of https://github.com/peterpersiel/victoria