Server-side changes for new competition logic
Merge branch 'master' of https://github.com/skishore/dropblox