Fix deprecation warnings with Django 1.7+
Merge pull request #113 from davidfischer-ch/fix-deprecated-warnings

Fix deprecation warnings with Django 1.7+