add Flickr Module
Merge branch 'flickr'