Merge branch 'master' of https://github.com/code-scouts/code_scouts_platform into events
Merge branch 'events' of https://github.com/code-scouts/code_scouts_platform into events
Upgraded Django to 1.5, all tests pass. Updating requirements.txt.
Merge remote-tracking branch 'origin/upgrade'