Merge pull request #3 from gamejamalicante/develop

Challenges, image uploader improvements
Merge branch 'develop'
Hotfix compo
Hotfixes in challenges
More hotfixes
Hotfix images
Disaster recovery stuff
More hotfixes and stuff
Deploy fix
Deploy fix
Fix
Fixed dir