[SERVER FIX] Compatibility for Django 1.5
Merge pull request #25 from frank-retief/01-2014-Srv

[SERVER FIX] Compatibility for Django 1.5