flickr fixing - unsuccessful
Merge branch 'master' of https://github.com/Anonyfox/waynamic

Conflicts:
	backend/lib/flickr.coffee