added dropbox sdk
fixed merged conflicts
basic dropbox handling
updated key
added dropbox aggregator
Merge branch 'backend' of https://github.com/sgeller/tc-disrupt-berlin-2013 into backend
fixed typo