Added Flickr login
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/requirements.txt