Fixed a bug that ocurred when using Django < 1.7
Merge branch 'dev' of https://github.com/jonashagstedt/swampdragon into dev