working flickr
fixed merge conflicts
Merge branch 'backend' of https://github.com/sgeller/tc-disrupt-berlin-2013 into backend