new django version 1.5.1 - Fixes #14
Merge branch 'hotfix_new_django' into develop
Merge branch 'develop'