Galeria de flickr
Merge origin/master