Django 1.7 compatibility added
Merge pull request #41 from RGV/django1.7-compat

Django 1.7 compatibility added