Adiciona um plugin para o flickr
Merge branch 'plugin-flickr'

Conflicts:
	requirements/base.txt